From 0bd94006e5841be309c1092642eb06a504a50a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 30 Aug 2023 14:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchantOrder/impl/MerchantOrderServiceImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
index 2d11bbc..6692a98 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
@@ -1830,12 +1830,13 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             MsgException.check(true, "退款金额超限，请输入正确的退款金额！");
         }
 
-        if(N.eq(returnAmount.add(amount),trueAmount)){
-            queryMerchantOrder.setRefundType(2);
+        if(N.eq(amount,trueAmount)){
+            queryMerchantOrder.setRefundType(1);
+            queryMerchantOrder.setRefundAmt(amount);
+        }else if(N.eq(returnAmount.add(amount),trueAmount)){
+            queryMerchantOrder.setRefundType(6);
             queryMerchantOrder.setRefundAmt(trueAmount);
-        }
-
-        if(N.gt(trueAmount,returnAmount.add(amount))){
+        }else  if(N.gt(trueAmount,returnAmount.add(amount))){
             queryMerchantOrder.setRefundType(6);
             queryMerchantOrder.setRefundAmt(returnAmount.add(amount));
         }