diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java index c48299f4..7385f7fa 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java @@ -7,7 +7,6 @@ import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.czg.account.entity.ShopUser; -import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; import com.czg.account.vo.UserCouponVo; import com.czg.market.dto.ShopCouponDTO; @@ -16,7 +15,6 @@ import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkCouponGiftService; import com.czg.market.service.MkShopCouponRecordService; import com.czg.market.service.ShopCouponService; -import com.czg.product.service.ProductService; import com.czg.service.market.mapper.ShopCouponMapper; import com.czg.utils.AssertUtil; import com.czg.utils.PageUtil; @@ -36,8 +34,6 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; -import static java.lang.StringTemplate.STR; - /** * 优惠券信息表 服务层实现。 * @@ -84,17 +80,17 @@ public class ShopCouponServiceImpl extends ServiceImpl tbUserCouponVos = recordService.queryByVipIdAndShopId(shopId, shopUserId, type); if (CollectionUtil.isNotEmpty(tbUserCouponVos)) { String week = DateUtil.dayOfWeekEnum(new Date()).toChinese("周"); - LocalTime now = LocalTime.now(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); //券id 券使用描述 Map coupons = new HashMap<>(); for (UserCouponVo tbUserCouponVo : tbUserCouponVos) { if (!coupons.containsKey(tbUserCouponVo.getCouponId())) { - setCouponInfo(coupons, tbUserCouponVo, null, week, now, formatter); + setCouponInfo(coupons, tbUserCouponVo, null, week, formatter); } JSONObject couponJson = coupons.get(tbUserCouponVo.getCouponId()); tbUserCouponVo.setUseRestrictions(couponJson.getString("useRestrictions")); @@ -188,7 +183,7 @@ public class ShopCouponServiceImpl extends ServiceImpl coupons, UserCouponVo tbUserCouponVo, BigDecimal amount, String week, LocalTime now, DateTimeFormatter formatter) { + private void setCouponInfo(Map coupons, UserCouponVo tbUserCouponVo, BigDecimal amount, String week, DateTimeFormatter formatter) { JSONObject json = new JSONObject(); boolean isUse = true; ShopCoupon tbShopCoupon = getById(tbUserCouponVo.getCouponId());