From 99f42514cf5466dd1277b628552dee916da0f6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 29 Sep 2025 16:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=B6=88=E8=B4=B9=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=A2=9E=E6=88=90=E9=95=BF=E5=80=BC=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/market/service/MkShopRechargeService.java     | 2 +-
 .../market/service/impl/MkShopRechargeServiceImpl.java    | 8 ++++----
 .../service/order/service/impl/OrderInfoServiceImpl.java  | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java
index e1efc6c2..286edc17 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java
@@ -28,7 +28,7 @@ public interface MkShopRechargeService extends IService<MkShopRecharge> {
 
     BigDecimal checkRecharge(Long mainShopId, @NotNull(message = "店铺不能为空") Long shopId, Long userId, Long rechargeDetailId, @DecimalMin("0.01") BigDecimal money);
 
-    void recharge(Long shopId, Long shopUserId, Long relatedId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum);
+    void recharge(Long shopId, Long shopUserId, Long rechargeDetailId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum);
 
     List<RechargeListVO> getList(long loginIdAsLong);
 
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
index 5429c797..689e975b 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -156,8 +156,8 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
     }
 
     @Override
-    public void recharge(Long shopId, Long shopUserId, Long relatedId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum) {
-        log.info("充值回调, 用户id: {}, 金额: {}, 关联id: {}", shopUserId, amount, relatedId);
+    public void recharge(Long shopId, Long shopUserId, Long rechargeDetailId, BigDecimal amount, Long paymentId, String payType, ShopUserFlowBizEnum bizEnum) {
+        log.info("充值回调, 用户id: {}, 金额: {}, rechargeDetailId: {}", shopUserId, amount, rechargeDetailId);
         ShopUser shopUser = shopUserService.getById(shopUserId);
         ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
                 .setId(shopUserId)
@@ -165,8 +165,8 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
                 .setBizEnum(bizEnum)
                 .setRelationId(paymentId);
         // 标准充值
-        if (relatedId != null) {
-            MkShopRechargeDetail rechargeDetail = shopRechargeDetailService.getById(relatedId);
+        if (rechargeDetailId != null) {
+            MkShopRechargeDetail rechargeDetail = shopRechargeDetailService.getById(rechargeDetailId);
             shopUserMoneyEditDTO.setMoney(rechargeDetail.getAmount().add(rechargeDetail.getRewardAmount()));
             // 发放积分
             if (rechargeDetail.getRewardPoints() != null) {
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index bc01d2f7..4baa4417 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -14,6 +14,7 @@ import com.czg.account.entity.*;
 import com.czg.account.service.*;
 import com.czg.config.RabbitPublisher;
 import com.czg.config.RedisCst;
+import com.czg.constant.TableValueConstant;
 import com.czg.entity.notify.CzgPayNotifyDTO;
 import com.czg.entity.notify.CzgRefundNotifyDTO;
 import com.czg.enums.ShopTableStatusEnum;
@@ -843,6 +844,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                 // 会员加入
                 memberConfigService.joinMemberByCondition(orderInfo.getShopId(), orderInfo.getUserId());
+                // 会员消费赠送成长值
+                memberConfigService.deliver(orderInfo.getShopId(), orderInfo.getUserId(), TableValueConstant.MemberExpFlow.Type.COST, orderInfo.getPayAmount(), null, orderInfo.getId());
             } else if ("memberIn".equals(payment.getPayType()) || "free".equals(payment.getPayType())) {
                 boolean isFree = "free".equals(payment.getPayType());
                 ShopUser shopUser = shopUserService.getById(payment.getSourceId());
@@ -890,6 +893,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             } else if ("memberPay".equals(payment.getPayType())) {
                 ShopUser shopUser = shopUserService.getById(payment.getSourceId());
                 memberConfigService.joinMember(payment.getShopId(), shopUser.getUserId(), payment.getRelatedId());
+
+                // 充值赠送积分
+                memberConfigService.deliver(shopUser.getMainShopId(), shopUser.getUserId(), TableValueConstant.MemberExpFlow.Type.COST, payment.getAmount(), null, payment.getId());
+
             }
         }
     }