From b41cdd0a60edd1d4ced6c6625fb3e08921c4d83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 10 Nov 2025 11:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=96=B0=E5=AE=A2?=
 =?UTF-8?q?=E7=AB=8B=E5=87=8F=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ConsumeDiscountController.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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<MkShopConsumeDiscountRecord> getDiscountByUserId(@RequestParam Long shopId, @RequestParam Long userId, @RequestParam(required = false) Long orderId) {
-        return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, userId, orderId));
+    public CzgResult<MkShopConsumeDiscountRecord> 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));
     }