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 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 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)) {