From d47aba8add1b4563582c9c6b79fe826286e7138f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 13 Nov 2025 09:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E9=80=80=E6=AC=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/task/MemberTask.java    |  1 +
 .../impl/TbMemberConfigServiceImpl.java       | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
index 83a40f263..f7e2857c2 100644
--- a/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/MemberTask.java
@@ -44,6 +44,7 @@ public class MemberTask {
         });
     }
 
+    @Scheduled(cron = "0 */10 * * * *")
     public void check() {
         List<ShopUser> shopUsers = shopUserService.list(new QueryWrapper().isNotNull(ShopUser::getEndTime).eq(ShopUser::getIsVip, 1).lt(ShopUser::getEndTime, DateUtil.date()));
         shopUsers.forEach(item -> {
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index 20b6a11d0..cf2ee0d6c 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -281,6 +281,20 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         return memberLevelVOS;
     }
 
+    static void main() {
+        Integer expVal = 10;
+        TableValueConstant.MemberExpFlow.Type type = TableValueConstant.MemberExpFlow.Type.PAY;
+        long exp = 0;
+        switch (type) {
+            case PAY -> {
+                exp = expVal;
+            }
+        }
+
+        System.out.println(exp);
+
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId) {
@@ -308,7 +322,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
             return false;
         }
 
-        log.info("会员奖励发放，类型: {}， 金额: {}, userId: {}", type.getCode(), money, userId);
+        log.info("会员奖励发放，类型: {}， 金额: {}, userId: {}, 经验值: {}", type.getCode(), money, userId, expVal);
 
         long exp = 0;
         switch (type) {
@@ -501,10 +515,11 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
         }
 
 
+        memberOrder.setPayAmount(memberOrder.getAmount());
         memberOrder.setStatus(OrderStatusEnums.DONE.getCode());
         memberOrderService.updateById(memberOrder);
         if (memberOrder.getReward() != null) {
-            deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getPayAmount(), memberOrder.getReward(), memberOrderId);
+            deliver(shopId, userId, TableValueConstant.MemberExpFlow.Type.PAY, memberOrder.getAmount(), memberOrder.getReward(), memberOrderId);
         }
         if (shopUser.getMemberLevelId() == null || shopUser.getMemberLevelId() == 0) {
             shopUser.setMemberLevelId(levelConfig.getId());