From d15f0ec207776ac4f81424ff3cfafbc923f4135f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 27 Sep 2025 10:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/account/entity/MemberPoints.java    | 3 ++-
 .../account/service/impl/MemberPointsServiceImpl.java     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberPoints.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberPoints.java
index c62d07986..a547f8319 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberPoints.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/MemberPoints.java
@@ -33,7 +33,8 @@ public class MemberPoints implements Serializable {
     /**
      * 店铺id
      */
-    private Long shopId;
+    private Long sourceShopId;
+    private Long mainShopId;
     /**
      * 会员名称
      */
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java
index 7d2d44095..6d096649c 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsServiceImpl.java
@@ -64,7 +64,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         if (byId.getIsEnableVipSync().equals(1)) {
             shopId = byId.getMainId();
         }
-        queryWrapper.eq(MemberPoints::getShopId, shopId);
+        queryWrapper.eq(MemberPoints::getSourceShopId, shopId);
         queryWrapper.orderBy(MemberPoints::getShopUserId, false);
         return queryWrapper;
     }
@@ -97,7 +97,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     @Override
     public OrderDeductionPointsDTO getMemberUsablePoints(Long shopUserId, BigDecimal orderAmount) {
         MemberPoints entity = initMemberPoints(shopUserId);
-        Long shopId = entity.getShopId();
+        Long shopId = entity.getSourceShopId();
         Integer accountPoints = entity.getAccountPoints();
         OrderDeductionPointsDTO dto = new OrderDeductionPointsDTO();
         dto.setAccountPoints(accountPoints);
@@ -206,7 +206,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
 
         // 记录积分变动记录
         MemberPointsLog log = new MemberPointsLog();
-        log.setShopId(entity.getShopId());
+        log.setShopId(entity.getSourceShopId());
         log.setShopUserId(entity.getShopUserId());
         log.setContent(content);
         log.setFloatType("subtract");
@@ -231,7 +231,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         entity.setLastFloatPoints(points);
         // 记录积分变动记录
         MemberPointsLog log = new MemberPointsLog();
-        log.setShopId(entity.getShopId());
+        log.setShopId(entity.getSourceShopId());
         log.setShopUserId(entity.getShopUserId());
         log.setContent(content);
         log.setFloatType("add");