From 91439621106f1cef41668e018dd1ead028579291 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Mon, 23 Sep 2024 22:06:08 +0800
Subject: [PATCH] 1

---
 .../custom/controller/admin/CustomerBalanceController.java   | 2 +-
 .../custom/service/impl/CustomerActiveServiceImpl.java       | 4 ++++
 .../custom/service/impl/CustomerBalanceServiceImpl.java      | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerBalanceController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerBalanceController.java
index 836c8030..07e4092f 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerBalanceController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerBalanceController.java
@@ -26,7 +26,7 @@ public class CustomerBalanceController {
     private CustomerBalanceService customerBalanceService;
 
     /**
-     * 支付完成回调
+     * 更新用户余额信息(充值完成的回调)
      * @author PQZ
      * @date 21:42 2024/9/23
      * @param createReqVO CustomerBalanceSaveReqVO
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
index 1b317fb5..0fecd296 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerActiveServiceImpl.java
@@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.member.service.ActiveMainService;
 import cn.iocoder.yudao.module.member.service.MemberCouponService;
 import cn.iocoder.yudao.module.member.vo.ActiveMainPageReqVO;
 import cn.iocoder.yudao.module.member.vo.ActiveMainRespVO;
+import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mzt.logapi.service.IFunctionService;
@@ -60,6 +61,9 @@ public class CustomerActiveServiceImpl extends ServiceImpl<CustomerActiveMapper,
     @Resource
     @Lazy
     private CustomerBalanceService balanceService;
+    @Resource
+    @Lazy
+    private RepairOrderInfoService repairOrderInfoService;
 
 
     /**
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerBalanceServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerBalanceServiceImpl.java
index 949b734d..b1cd7156 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerBalanceServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerBalanceServiceImpl.java
@@ -61,7 +61,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
     }
 
     /**
-     * 更新用户余额信息
+     * 更新用户余额信息(充值完成的回调)
      *
      * @param cusId    用户id
      * @param orderId  订单id
@@ -81,8 +81,9 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
             //获取当前活动信息
             ActiveMainRespVO active = activeMainService.getActiveMain(activeId, true);
             balance = transBalance(customer, orderInfo.getPayMoney(), active.getRuleList());
+        } else {
+            balance = transBalance(customer, orderInfo.getPayMoney(), null);
         }
-        balance = transBalance(customer, orderInfo.getPayMoney(), null);
         orderInfo.setOrderStatus(GENERAL_YES);
         orderInfo.setPayTime(LocalDateTime.now());
         orderInfoService.updateById(orderInfo);