diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java index 0d53e118..fa0ac463 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java @@ -1,5 +1,8 @@ package com.czg.market.entity; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSONObject; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; @@ -10,6 +13,7 @@ import java.sql.Time; import java.time.LocalDateTime; import java.io.Serial; +import java.time.LocalTime; import lombok.AllArgsConstructor; import lombok.Builder; @@ -241,4 +245,10 @@ public class ShopCoupon implements Serializable { */ private Integer isDel; + public void setInfo() { + if ("fixed".equals(getValidType())) { + setValidEndTime(LocalDateTime.now().plusDays(validDays)); + } + } + } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index 72ae464f..878465da 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -102,7 +102,11 @@ public class MkShopRechargeServiceImpl extends ServiceImpl couponMap = shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponIdList)).stream().collect(Collectors.toMap(ShopCoupon::getId, v -> v)); couponInfoDTOS.forEach(item -> { - couponInfoVOS.add(new CouponInfoVO().setCoupon(couponMap.get(item.getId())).setNum(item.getNum())); + ShopCoupon shopCoupon = couponMap.get(item.getId()); + if (shopCoupon != null) { + shopCoupon.setInfo(); + } + couponInfoVOS.add(new CouponInfoVO().setCoupon(shopCoupon).setNum(item.getNum())); }); } detailVO.setCouponInfoList(couponInfoVOS);