From 29ae670ec0a5594280af0b6c65097d7f27ec0ac7 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 19 Mar 2025 10:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=85=85=E5=80=BC=20?=
 =?UTF-8?q?=E8=B5=A0=E9=80=81=20=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/PayServiceImpl.java   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index 04dd9cb8..c7333ec7 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -524,7 +524,17 @@ public class PayServiceImpl implements PayService {
         //更新会员余额 并生成流水
         shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
         userFlowService.updateRefund(inFlow.getId(), refPayParam.getRefAmount());
-        if (giftFlow != null) {
+        if (giftFlow != null && (giftFlow.getAmount().subtract(refPayParam.getRefAmount())).compareTo(BigDecimal.ZERO) > 0) {
+            ShopUserMoneyEditDTO giftFlowEdit = new ShopUserMoneyEditDTO()
+                    .setId(shopUser.getId())
+                    .setMoney(giftFlow.getAmount())
+                    .setType(0)
+                    .setRemark("退款")
+                    .setBizEnum(ShopUserFlowBizEnum.RECHARGE_REFUND)
+                    .setRelationId(refPaymentId)
+                    .setRechargeId(giftFlow.getId());
+            //更新会员余额 并生成流水
+            shopUserService.updateMoney(shopUser.getShopId(), giftFlowEdit);
             userFlowService.updateRefund(giftFlow.getId(), giftFlow.getAmount());
         }
         //移除优惠券