From 2e116de9a8936a78f38789a76abc284af13030a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 16 Oct 2025 17:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/user/UBirthdayGiftController.java |  6 +++---
 .../service/impl/MkBirthdayGiftServiceImpl.java  | 16 ++++++++++++----
 .../impl/MkConsumeCashbackServiceImpl.java       |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java
index 3dd460d62..6d911eda9 100644
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java
@@ -1,13 +1,13 @@
 package com.czg.controller.user;
 
-import com.czg.market.entity.ShopCoupon;
 import com.czg.market.service.MkBirthdayGiftService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
 
 /**
  * 生日有礼相关
@@ -24,7 +24,7 @@ public class UBirthdayGiftController {
      * 获取生日有礼 不为空则代表今日发放生日有礼的奖励
      */
     @GetMapping
-    public CzgResult<List<ShopCoupon>> detail(@RequestParam Integer shopId) {
+    public CzgResult<ArrayList<Map<String, Object>>> detail(@RequestParam Integer shopId) {
         return CzgResult.success(service.getInfo(StpKit.USER.getLoginIdAsLong(), shopId));
     }
 
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
index 26f3595b8..3d03cc410 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
@@ -15,6 +15,7 @@ import com.czg.constant.TableValueConstant;
 import com.czg.market.dto.CouponInfoDTO;
 import com.czg.market.dto.MkBirthdayGiftDTO;
 import com.czg.market.dto.MkRewardCouponDTO;
+import com.czg.market.dto.ShopCouponDTO;
 import com.czg.market.entity.*;
 import com.czg.market.service.*;
 import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
@@ -35,7 +36,6 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -227,7 +227,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
     }
 
     @Override
-    public List<ShopCoupon> getInfo(long userId, Integer shopId) {
+    public ArrayList<Map<String, Object>> getInfo(long userId, Integer shopId) {
         MkBirthdayGift birthdayGift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId).eq(MkBirthdayGift::getIsEnable, 1));
         if (birthdayGift == null) {
             return null;
@@ -253,8 +253,16 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
             }
 
             if (DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate().isEqual(current)) {
-                List<CouponInfoDTO> couponInfoList = config.getCouponInfoList();
-                return shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponInfoList.stream().map(CouponInfoDTO::getId).toList()));
+                ArrayList<Map<String, Object>> arrayList = new ArrayList<>();
+                config.getCouponInfoList().forEach(item -> {
+
+                    ShopCouponDTO shopCoupon = shopCouponService.getCouponById(item.getId());
+                    arrayList.add(Map.of(
+                            "num", item.getNum(),
+                            "couponInfo", shopCoupon
+                    ));
+                });
+                return arrayList;
             }
         }
 
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
index ae4e859ac..09e2072ab 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
@@ -109,7 +109,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
             for (MkConsumeCashbackStep cashbackStep : cashbackStepList) {
 
                 if (cashbackStep.getAmount().compareTo(amount) <= 0 ) {
-                    BigDecimal cashbackAmount = BigDecimal.ZERO;
+                    BigDecimal cashbackAmount;
                     // 固定金额
                     if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) {
                         cashbackAmount = cashbackStep.getCashbackAmount();