Merge remote-tracking branch 'origin/test' into test

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;
             }
         }
 

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();