From afb54aa7405dee58468f337e6b9f4c2cec475bd9 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 7 Nov 2025 16:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=87=91=E9=A2=9D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/user/UMemberPointsController.java  | 2 +-
 .../service/account/service/impl/MemberPointsServiceImpl.java  | 2 +-
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java
index 65fea7dc4..183d5979f 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UMemberPointsController.java
@@ -36,7 +36,7 @@ public class UMemberPointsController {
      */
     @GetMapping("pointsBasicSetting")
     public CzgResult<PointsBasicSettingDTO> getPointsBasicSetting() {
-        Long shopId = StpKit.USER.getShopId(0L);
+        Long shopId = StpKit.USER.getShopId();
         PointsBasicSetting entity = pointsBasicSettingService.getById(shopId);
         PointsBasicSettingDTO data = BeanUtil.copyProperties(entity, PointsBasicSettingDTO.class);
         return CzgResult.success(data);
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 2336b662e..cf7828310 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
@@ -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.getSourceShopId();
+        Long shopId = entity.getMainShopId();
         Integer accountPoints = entity.getAccountPoints();
         OrderDeductionPointsDTO dto = new OrderDeductionPointsDTO();
         dto.setAccountPoints(accountPoints);
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 5ea2baa06..60b11b976 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
@@ -363,7 +363,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0);
         }
         // 积分校验
-        PointsBasicSetting pointSetting = pointsBasicService.getById(shopId);
+        Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
+        PointsBasicSetting pointSetting = pointsBasicService.getById(mainShopId);
         boolean usePointsDeduction = param.getPointsNum() > 0 || param.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0;
         if (usePointsDeduction) {
             if (pointSetting == null || !pointSetting.getEnableDeduction().equals(1)) {