From 38455ebd37190d2c2b50341ea7ed45c029c6be23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Thu, 17 Aug 2023 11:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MerchantOrderServiceImpl.java         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 0a9b91a..8743372 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
@@ -1585,16 +1585,17 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             update.setId(order.getId());
             update.setMarketAmt(BigDecimal.ZERO);
         }
-        update.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        update.setRefundAmt(order.getRefundAmt());
         merchantOrderMapper.updateById(update);
         refundOrder.convert(order, resultMap, channel.getMerchantId());
         order.setId(null);
         order.setUpdateTime(new Date());
         order.setStatus("2");
         order.setMarketAmt(BigDecimal.ZERO);
-        order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        order.setRefundAmt(order.getRefundAmt());
+        order.setOrderNumber(refundOrder.getRefundNo());
         merchantOrderMapper.insert(order);
-        realFansService.removeProfit(order.getOrderNumber());
+        realFansService.removeProfit(order);
         merchantRefundOrderMapper.insert(refundOrder);
         if("app".equals(type)){
             //向小程序后台推送退款消息
@@ -1702,9 +1703,9 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             update.setId(order.getId());
             update.setMarketAmt(BigDecimal.ZERO);
         }
-        update.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        update.setRefundAmt(order.getRefundAmt());
         merchantOrderMapper.updateById(update);
-        refundOrder.convert(order, resultMap,channel.getMerchantId(),order.getRefundAmt(),mercRefundNo,notifyUrl);
+        refundOrder.convert(order, resultMap,channel.getMerchantId(),amount,mercRefundNo,notifyUrl);
         order.setId(null);
         order.setUpdateTime(new Date());
         if(order.getRefundType()==2){
@@ -1715,9 +1716,9 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             order.setStatus("6");
         }
         order.setMarketAmt(BigDecimal.ZERO);
-        order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        order.setRefundAmt(order.getRefundAmt());
         merchantOrderMapper.insert(order);
-        realFansService.removeProfit(order.getOrderNumber());
+        realFansService.removeProfit(order);
         merchantRefundOrderMapper.insert(refundOrder);
         if("app".equals(type)){
             //向小程序后台推送退款消息
@@ -1829,6 +1830,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
         }
 
         queryMerchantOrder.setUserId(queryUserApp.getUserId().intValue());
+        queryMerchantOrder.setPayReturnAmount(amount);
         return queryMerchantOrder;
     }
 
@@ -2865,7 +2867,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
         order.setMarketAmt(BigDecimal.ZERO);
         order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
         merchantOrderMapper.insert(order);
-        realFansService.removeProfit(order.getOrderNumber());
+        realFansService.removeProfit(order);
         merchantRefundOrderMapper.insert(refundOrder);
         if("app".equals(type)){
             //向小程序后台推送退款消息