From 42fbc8ba657f23117c210b7644a72e03bdf6025d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 17 Sep 2025 11:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=9A=8F=E6=9C=BA=E7=AB=8B?=
 =?UTF-8?q?=E5=87=8F=E9=87=91=E9=A2=9D=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/ShopRechargeController.java   | 10 ++++++++++
 .../user/UShopConsumeDiscountController.java           |  9 ++++++++-
 .../impl/MkShopConsumeDiscountRecordServiceImpl.java   |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
index 8d0fcaa1..8499fa14 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ShopRechargeController.java
@@ -1,8 +1,10 @@
 package com.czg.controller.admin;
 
 import com.czg.market.dto.MkShopRechargeDTO;
+import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.entity.MkShopRechargeFlow;
 import com.czg.market.service.MkRechargeFlowService;
+import com.czg.market.service.MkShopConsumeDiscountRecordService;
 import com.czg.market.service.MkShopRechargeService;
 import com.czg.market.vo.MkShopRechargeVO;
 import com.czg.resp.CzgResult;
@@ -25,6 +27,14 @@ public class ShopRechargeController {
     @Resource
     private MkRechargeFlowService rechargeFlowService;
 
+    @Resource
+    private MkShopConsumeDiscountRecordService shopConsumeDiscountRecordService;
+
+    @GetMapping("/test")
+    public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId) {
+        return CzgResult.success(shopConsumeDiscountRecordService.get(shopId));
+    }
+
     /**
      * 配置信息获取
      * 权限标识: activate:list
diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
index 45df15f0..c5a77820 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java
@@ -23,7 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 店铺会员相关
+ * 新客立减相关
  *
  * @author Administrator
  */
@@ -32,6 +32,13 @@ import org.springframework.web.bind.annotation.*;
 public class UShopConsumeDiscountController {
     @Resource
     private MkShopConsumeDiscountRecordService shopConsumeDiscountRecordService;
+
+    /**
+     * 获取新客立减金额
+     * 返回新客立减当次减免金额
+     * @param shopId 店铺id
+     * @return 金额
+     */
     @GetMapping
     public CzgResult<MkShopConsumeDiscountRecord> get(@RequestParam Long shopId) {
         return CzgResult.success(shopConsumeDiscountRecordService.get(shopId));
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
index 37ab103e..bb4c4495 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java
@@ -35,6 +35,7 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl<MkShopCo
 
         MkShopConsumeDiscountRecord shopConsumeDiscountRecord = new MkShopConsumeDiscountRecord();
         shopConsumeDiscountRecord.setShopId(shopId);
+        shopConsumeDiscountRecord.setConsumeDiscountId(consumeDiscountVO.getId());
 
         // 固定金额
         if (TableValueConstant.ConsumeDiscount.DiscountType.FIXED.getCode().equals(consumeDiscountVO.getDiscountType())) {