From aa71de3aa3b1ab3f71ae6d36177eac9835c03cee Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Mon, 17 Mar 2025 16:41:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/MemberPointsController.java         | 20 +++++-----
 .../user/UMemberPointsController.java         | 18 ++++-----
 .../dto/points/MemberPointsLogDTO.java        |  2 +-
 .../com/czg/account/entity/MemberPoints.java  | 10 ++---
 .../param/ConsumeAwardPointsParam.java        |  2 +-
 .../account/param/PayedDeductPointsParam.java |  2 +-
 .../account/service/MemberPointsService.java  | 32 +++++++--------
 .../impl/MemberPointsLogServiceImpl.java      |  2 +-
 .../service/impl/MemberPointsServiceImpl.java | 40 +++++++++----------
 .../impl/PointsExchangeRecordServiceImpl.java |  4 +-
 .../service/impl/OrderInfoServiceImpl.java    |  7 ++--
 11 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java
index f3620b8d0..6e8521abf 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MemberPointsController.java
@@ -43,33 +43,33 @@ public class MemberPointsController {
      * 001-会员积分账户信息
      */
     @GetMapping("userPoints")
-    public CzgResult<MemberPoints> getMemberPoints(@RequestParam Long userId) {
-        MemberPoints data = memberPointsService.getMemberPoints(userId);
+    public CzgResult<MemberPoints> getMemberPoints(@RequestParam Long shopUserId) {
+        MemberPoints data = memberPointsService.getMemberPoints(shopUserId);
         return CzgResult.success(data);
     }
 
     /**
      * 002-获取订单可用积分及抵扣金额（支付页面使用）
      *
-     * @param userId      用户id
+     * @param shopUserId      用户id
      * @param orderAmount 订单金额
      */
     @GetMapping("calcUsablePoints")
-    public CzgResult<OrderDeductionPointsDTO> getMemberUsablePoints(@RequestParam Long userId, @RequestParam BigDecimal orderAmount) {
-        OrderDeductionPointsDTO usablePoints = memberPointsService.getMemberUsablePoints(userId, orderAmount);
+    public CzgResult<OrderDeductionPointsDTO> getMemberUsablePoints(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount) {
+        OrderDeductionPointsDTO usablePoints = memberPointsService.getMemberUsablePoints(shopUserId, orderAmount);
         return CzgResult.success(usablePoints);
     }
 
     /**
      * 004-根据抵扣金额计算所需积分
      *
-     * @param userId          用户id
+     * @param shopUserId          用户id
      * @param orderAmount     订单金额
      * @param deductionAmount 抵扣金额
      */
     @GetMapping("calcUsedPoints")
-    public CzgResult<Integer> calcUsedPoints(@RequestParam Long userId, @RequestParam BigDecimal orderAmount, @RequestParam BigDecimal deductionAmount) {
-        int points = memberPointsService.calcUsedPoints(userId, orderAmount, deductionAmount);
+    public CzgResult<Integer> calcUsedPoints(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount, @RequestParam BigDecimal deductionAmount) {
+        int points = memberPointsService.calcUsedPoints(shopUserId, orderAmount, deductionAmount);
         return CzgResult.success(points);
     }
 
@@ -77,8 +77,8 @@ public class MemberPointsController {
      * 003-根据积分计算可抵扣金额
      */
     @GetMapping("calcDeductionAmount")
-    public CzgResult<BigDecimal> calcDeductionAmount(@RequestParam Long userId, @RequestParam BigDecimal orderAmount, @RequestParam Integer points) {
-        BigDecimal deductionAmount = memberPointsService.calcDeductionAmount(userId, orderAmount, points);
+    public CzgResult<BigDecimal> calcDeductionAmount(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount, @RequestParam Integer points) {
+        BigDecimal deductionAmount = memberPointsService.calcDeductionAmount(shopUserId, orderAmount, points);
         return CzgResult.success(deductionAmount);
     }
 
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 d328362e3..eec02c175 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
@@ -55,38 +55,38 @@ public class UMemberPointsController {
     /**
      * 002-获取订单可用积分及抵扣金额（支付页面使用）
      *
-     * @param userId      用户id
+     * @param shopUserId  用户id
      * @param orderAmount 订单金额
      */
     @GetMapping("calcUsablePoints")
-    public CzgResult<OrderDeductionPointsDTO> getMemberUsablePoints(@RequestParam Long userId, @RequestParam BigDecimal orderAmount) {
-        OrderDeductionPointsDTO usablePoints = memberPointsService.getMemberUsablePoints(userId, orderAmount);
+    public CzgResult<OrderDeductionPointsDTO> getMemberUsablePoints(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount) {
+        OrderDeductionPointsDTO usablePoints = memberPointsService.getMemberUsablePoints(shopUserId, orderAmount);
         return CzgResult.success(usablePoints);
     }
 
     /**
      * 004-根据抵扣金额计算所需积分
      *
-     * @param userId          用户id
+     * @param shopUserId      用户id
      * @param orderAmount     订单金额
      * @param deductionAmount 抵扣金额
      */
     @GetMapping("calcUsedPoints")
-    public CzgResult<Integer> calcUsedPoints(@RequestParam Long userId, @RequestParam BigDecimal orderAmount, @RequestParam BigDecimal deductionAmount) {
-        int points = memberPointsService.calcUsedPoints(userId, orderAmount, deductionAmount);
+    public CzgResult<Integer> calcUsedPoints(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount, @RequestParam BigDecimal deductionAmount) {
+        int points = memberPointsService.calcUsedPoints(shopUserId, orderAmount, deductionAmount);
         return CzgResult.success(points);
     }
 
     /**
      * 003-根据积分计算可抵扣金额
      *
-     * @param userId      用户id
+     * @param shopUserId  用户id
      * @param orderAmount 订单金额
      * @param points      使用积分
      */
     @GetMapping("calcDeductionAmount")
-    public CzgResult<BigDecimal> calcDeductionAmount(@RequestParam Long userId, @RequestParam BigDecimal orderAmount, @RequestParam Integer points) {
-        BigDecimal deductionAmount = memberPointsService.calcDeductionAmount(userId, orderAmount, points);
+    public CzgResult<BigDecimal> calcDeductionAmount(@RequestParam Long shopUserId, @RequestParam BigDecimal orderAmount, @RequestParam Integer points) {
+        BigDecimal deductionAmount = memberPointsService.calcDeductionAmount(shopUserId, orderAmount, points);
         return CzgResult.success(deductionAmount);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/MemberPointsLogDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/MemberPointsLogDTO.java
index a4f62335e..7c1aeced4 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/MemberPointsLogDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/points/MemberPointsLogDTO.java
@@ -28,7 +28,7 @@ public class MemberPointsLogDTO implements Serializable {
      */
     private Long shopId;
     /**
-     * 用户id
+     * 用户id(shopUserId)
      */
     private Long userId;
     /**
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 1c40b8316..c62d07986 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
@@ -25,19 +25,15 @@ public class MemberPoints implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * id
+     * 会员id
      */
     @Id(keyType = KeyType.Auto)
-    private Long id;
+    @Column(value = "id")
+    private Long shopUserId;
     /**
      * 店铺id
      */
     private Long shopId;
-    /**
-     * 会员id
-     */
-    @Column(value = "id")
-    private Long userId;
     /**
      * 会员名称
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/param/ConsumeAwardPointsParam.java b/cash-common/cash-common-service/src/main/java/com/czg/account/param/ConsumeAwardPointsParam.java
index bc34ed520..b6d218c3b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/param/ConsumeAwardPointsParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/param/ConsumeAwardPointsParam.java
@@ -18,7 +18,7 @@ public class ConsumeAwardPointsParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户ID
+     * 用户ID(shopUserId)
      */
     private Long userId;
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/param/PayedDeductPointsParam.java b/cash-common/cash-common-service/src/main/java/com/czg/account/param/PayedDeductPointsParam.java
index e328e15b6..879a1c6fd 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/param/PayedDeductPointsParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/param/PayedDeductPointsParam.java
@@ -18,7 +18,7 @@ public class PayedDeductPointsParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 用户ID
+     * 用户ID(shopUserId)
      */
     private Long userId;
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java
index 7d67bd117..9fdde6119 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/MemberPointsService.java
@@ -28,73 +28,73 @@ public interface MemberPointsService extends IService<MemberPoints> {
     /**
      * 初始化会员积分
      *
-     * @param userId 用户id
+     * @param shopUserId 用户id
      * @return 会员积分等信息
      */
-    MemberPoints initMemberPoints(Long userId);
+    MemberPoints initMemberPoints(Long shopUserId);
 
     /**
      * 获取会员积分等信息
      *
-     * @param userId 用户id
+     * @param shopUserId 用户id
      * @return 会员积分等信息
      */
-    MemberPoints getMemberPoints(Long userId);
+    MemberPoints getMemberPoints(Long shopUserId);
 
     /**
      * 根据用户id及订单金额计算可抵扣积分及可抵扣金额
      *
-     * @param userId      用户id
+     * @param shopUserId      用户id
      * @param orderAmount 订单金额
      * @return 积分及金额
      */
-    OrderDeductionPointsDTO getMemberUsablePoints(Long userId, BigDecimal orderAmount);
+    OrderDeductionPointsDTO getMemberUsablePoints(Long shopUserId, BigDecimal orderAmount);
 
     /**
      * 根据抵扣金额计算抵扣积分
      *
-     * @param userId          用户id
+     * @param shopUserId          用户id
      * @param orderAmount     订单金额
      * @param deductionAmount 抵扣金额
      */
-    int calcUsedPoints(Long userId, BigDecimal orderAmount, BigDecimal deductionAmount);
+    int calcUsedPoints(Long shopUserId, BigDecimal orderAmount, BigDecimal deductionAmount);
 
     /**
      * 根据抵扣积分计算抵扣金额
      *
-     * @param userId      用户id
+     * @param shopUserId      用户id
      * @param orderAmount 订单金额
      * @param points      抵扣积分
      */
-    BigDecimal calcDeductionAmount(Long userId, BigDecimal orderAmount, int points);
+    BigDecimal calcDeductionAmount(Long shopUserId, BigDecimal orderAmount, int points);
 
     /**
      * 扣除积分
      *
-     * @param userId  用户id
+     * @param shopUserId  用户id
      * @param points  积分
      * @param content 摘要信息（如：兑换积分商品/积分抵扣账单/消费赠送积分/新会员送积分/储值赠送积分）
      * @param orderInfo 订单信息，可以为空
      */
-    boolean deductPoints(Long userId, int points, String content, OrderInfo orderInfo);
+    boolean deductPoints(Long shopUserId, int points, String content, OrderInfo orderInfo);
 
     /**
      * 追加积分
      *
-     * @param userId  用户id
+     * @param shopUserId  用户id
      * @param points  积分
      * @param content 摘要信息（如：兑换积分商品/积分抵扣账单/消费赠送积分/新会员送积分/储值赠送积分）
      * @param orderInfo 订单信息，可以为空
      * @return 成功/失败
      */
-    boolean addPoints(Long userId, int points, String content, OrderInfo orderInfo);
+    boolean addPoints(Long shopUserId, int points, String content, OrderInfo orderInfo);
 
     /**
      * 消费赠送积分
      *
-     * @param userId  用户id
+     * @param shopUserId  用户id
      * @param orderInfo 订单信息，可以为空
      */
-    void consumeAwardPoints(Long userId, OrderInfo orderInfo);
+    void consumeAwardPoints(Long shopUserId, OrderInfo orderInfo);
 
 }
\ No newline at end of file
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsLogServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsLogServiceImpl.java
index 9e37f8b20..bbf35f9b8 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsLogServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MemberPointsLogServiceImpl.java
@@ -64,7 +64,7 @@ public class MemberPointsLogServiceImpl extends ServiceImpl<MemberPointsLogMappe
         queryWrapper.select(MEMBER_POINTS.DEFAULT_COLUMNS)
                 .select(SHOP_USER.NICK_NAME.as(MemberPointsLogDTO::getNickName), SHOP_USER.HEAD_IMG.as(MemberPointsLogDTO::getHeadImg), SHOP_USER.PHONE.as(MemberPointsLogDTO::getPhone))
                 .from(MEMBER_POINTS_LOG)
-                .leftJoin(SHOP_USER).on(SHOP_USER.ID.eq(MEMBER_POINTS.USER_ID));
+                .leftJoin(SHOP_USER).on(SHOP_USER.ID.eq(MEMBER_POINTS.SHOP_USER_ID));
         return queryWrapper;
     }
 
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 138ea59c6..ebcdf56ba 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
@@ -54,7 +54,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
 
         Long shopId = StpKit.USER.getShopId(0L);
         queryWrapper.eq(MemberPoints::getShopId, shopId);
-        queryWrapper.orderBy(MemberPoints::getId, false);
+        queryWrapper.orderBy(MemberPoints::getShopUserId, false);
         return queryWrapper;
     }
 
@@ -66,8 +66,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     }
 
     @Override
-    public MemberPoints initMemberPoints(Long userId) {
-        MemberPoints entity = super.getOne(query().eq(MemberPoints::getUserId, userId));
+    public MemberPoints initMemberPoints(Long shopUserId) {
+        MemberPoints entity = super.getOne(query().eq(MemberPoints::getShopUserId, shopUserId));
         if (entity == null) {
             throw new CzgException("会员信息不存在");
         }
@@ -79,13 +79,13 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     }
 
     @Override
-    public MemberPoints getMemberPoints(Long userId) {
-        return initMemberPoints(userId);
+    public MemberPoints getMemberPoints(Long shopUserId) {
+        return initMemberPoints(shopUserId);
     }
 
     @Override
-    public OrderDeductionPointsDTO getMemberUsablePoints(Long userId, BigDecimal orderAmount) {
-        MemberPoints entity = initMemberPoints(userId);
+    public OrderDeductionPointsDTO getMemberUsablePoints(Long shopUserId, BigDecimal orderAmount) {
+        MemberPoints entity = initMemberPoints(shopUserId);
         Long shopId = entity.getShopId();
         Integer accountPoints = entity.getAccountPoints();
         OrderDeductionPointsDTO dto = new OrderDeductionPointsDTO();
@@ -148,8 +148,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     }
 
     @Override
-    public int calcUsedPoints(Long userId, BigDecimal orderAmount, BigDecimal deductionAmount) {
-        OrderDeductionPointsDTO core = getMemberUsablePoints(userId, orderAmount);
+    public int calcUsedPoints(Long shopUserId, BigDecimal orderAmount, BigDecimal deductionAmount) {
+        OrderDeductionPointsDTO core = getMemberUsablePoints(shopUserId, orderAmount);
         if (!core.getUsable()) {
             throw new CzgException(core.getUnusableReason());
         }
@@ -166,8 +166,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     }
 
     @Override
-    public BigDecimal calcDeductionAmount(Long userId, BigDecimal orderAmount, int points) {
-        OrderDeductionPointsDTO core = getMemberUsablePoints(userId, orderAmount);
+    public BigDecimal calcDeductionAmount(Long shopUserId, BigDecimal orderAmount, int points) {
+        OrderDeductionPointsDTO core = getMemberUsablePoints(shopUserId, orderAmount);
         if (!core.getUsable()) {
             throw new CzgException(core.getUnusableReason());
         }
@@ -186,8 +186,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
     }
 
     @Override
-    public boolean deductPoints(Long userId, int points, String content, OrderInfo orderInfo) {
-        MemberPoints entity = initMemberPoints(userId);
+    public boolean deductPoints(Long shopUserId, int points, String content, OrderInfo orderInfo) {
+        MemberPoints entity = initMemberPoints(shopUserId);
         // 扣除账户积分
         entity.setAccountPoints(entity.getAccountPoints() - points);
         entity.setLastPointsChangeTime(LocalDateTime.now());
@@ -196,7 +196,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         // 记录积分变动记录
         MemberPointsLog log = new MemberPointsLog();
         log.setShopId(entity.getShopId());
-        log.setUserId(entity.getUserId());
+        log.setUserId(entity.getShopUserId());
         log.setContent(content);
         log.setFloatType("subtract");
         log.setFloatPoints(-points);
@@ -212,8 +212,8 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean addPoints(Long userId, int points, String content, OrderInfo orderInfo) {
-        MemberPoints entity = initMemberPoints(userId);
+    public boolean addPoints(Long shopUserId, int points, String content, OrderInfo orderInfo) {
+        MemberPoints entity = initMemberPoints(shopUserId);
         // 增加账户积分
         entity.setAccountPoints(entity.getAccountPoints() + points);
         entity.setLastPointsChangeTime(LocalDateTime.now());
@@ -221,7 +221,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         // 记录积分变动记录
         MemberPointsLog log = new MemberPointsLog();
         log.setShopId(entity.getShopId());
-        log.setUserId(entity.getUserId());
+        log.setUserId(entity.getShopUserId());
         log.setContent(content);
         log.setFloatType("add");
         log.setFloatPoints(points);
@@ -236,7 +236,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void consumeAwardPoints(Long userId, OrderInfo orderInfo) {
+    public void consumeAwardPoints(Long shopUserId, OrderInfo orderInfo) {
         if (orderInfo == null) {
             throw new CzgException("订单不存在");
         }
@@ -255,7 +255,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
         String rewardsGroup = basicSetting.getRewardsGroup();
         MemberPoints entity;
         try {
-            entity = initMemberPoints(userId);
+            entity = initMemberPoints(shopUserId);
         } catch (Exception e) {
             return;
         }
@@ -271,6 +271,6 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
             return;
         }
         BigDecimal awardPoints = NumberUtil.roundDown(NumberUtil.div(payAmount, consumeAmount), 0);
-        addPoints(userId, awardPoints.intValue(), StrUtil.format("消费￥{}送{}积分", payAmount, awardPoints.intValue()), orderInfo);
+        addPoints(shopUserId, awardPoints.intValue(), StrUtil.format("消费￥{}送{}积分", payAmount, awardPoints.intValue()), orderInfo);
     }
 }
\ No newline at end of file
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java
index 3d7ac8178..5305c9903 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PointsExchangeRecordServiceImpl.java
@@ -146,7 +146,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
         if (quantity <= 0) {
             throw new CzgException("兑换的商品库存不足");
         }
-        MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getUserId, param.getUserId()));
+        MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getShopUserId, param.getUserId()));
         if (memberPoints == null) {
             throw new CzgException("会员积分不足无法兑换此商品");
         }
@@ -370,7 +370,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
         entity.setCancelOrRefundReason(param.getCancelOrRefundReason());
         entity.setCancelOrRefundTime(LocalDateTime.now());
         super.updateById(entity);
-        MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getUserId, entity.getUserId()));
+        MemberPoints memberPoints = memberPointsMapper.selectOneByQuery(query().eq(MemberPoints::getShopUserId, entity.getUserId()));
         if (memberPoints == null) {
             throw new CzgException("会员信息不存在");
         }
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 58567015e..b7939fb9c 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
@@ -1,7 +1,6 @@
 package com.czg.service.order.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.thread.ThreadUtil;
@@ -695,9 +694,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             updateChain.set(OrderInfo::getPayType, payType.getValue());
         }
         updateChain.update();
+        ShopUser shopUser = shopUserService.getShopUserInfo(orderInfo.getShopId(), orderInfo.getUserId());
         //积分使用
         if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
-            pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
+            pointsService.deductPoints(shopUser.getId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
         }
         //更新优惠券信息
         if (StrUtil.isNotBlank(orderInfo.getCouponInfoList()) && !"null".equals(orderInfo.getCouponInfoList())) {
@@ -707,7 +707,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 if (orderInfo.getUserId() == null) {
                     log.info("订单：{}优惠券使用失败，用户Id为空", orderInfo.getId());
                 } else {
-                    ShopUser shopUser = shopUserService.getShopUserInfo(orderInfo.getShopId(), orderInfo.getUserId());
                     if (shopUser == null) {
                         log.info("订单：{}优惠券使用失败，店铺用户不存在", orderInfo.getId());
                     } else {
@@ -717,7 +716,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
         }
         //下单赠送积分
-        pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo);
+        pointsService.consumeAwardPoints(shopUser.getId(), orderInfo);
 
         orderDetailService.updateChain().set(OrderDetail::getStatus, OrderStatusEnums.DONE.getCode()).eq(OrderDetail::getOrderId, orderInfo.getId()).update();
 //        if (!"after-pay".equals(orderInfo.getPayMode())) {