diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ConsumeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ConsumeDiscountController.java index 4b6a1486b..1c5a835e5 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ConsumeDiscountController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ConsumeDiscountController.java @@ -1,5 +1,7 @@ package com.czg.controller.admin; +import com.czg.account.entity.ShopUser; +import com.czg.account.service.ShopUserService; import com.czg.market.dto.MkConsumeDiscountDTO; import com.czg.market.entity.MkShopConsumeDiscountRecord; import com.czg.market.service.MkConsumeDiscountService; @@ -7,7 +9,9 @@ import com.czg.market.service.MkShopConsumeDiscountRecordService; import com.czg.market.vo.MkConsumeDiscountVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.czg.utils.AssertUtil; import jakarta.annotation.Resource; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,6 +29,8 @@ public class ConsumeDiscountController { private MkConsumeDiscountService consumeDiscountService; @Resource private MkShopConsumeDiscountRecordService shopConsumeDiscountRecordService; + @DubboReference + private ShopUserService shopUserService; /** * 配置信息获取 @@ -49,13 +55,14 @@ public class ConsumeDiscountController { /** * 根据用户id获取新客立减金额,返回null代表不可用 * @param shopId 店铺id - * @param userId 用户id * @param orderId 订单id 可选 * @return 新客立减金额 */ @GetMapping("/getDiscountByUserId") - public CzgResult getDiscountByUserId(@RequestParam Long shopId, @RequestParam Long userId, @RequestParam(required = false) Long orderId) { - return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, userId, orderId)); + public CzgResult getDiscountByUserId(@RequestParam Long shopId, @RequestParam Long shopUserId, @RequestParam(required = false) Long orderId) { + ShopUser shopUser = shopUserService.getById(shopUserId); + AssertUtil.isNull(shopUser, "用户不存在"); + return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, shopUser.getUserId(), orderId)); }