bug fixes

src/main/java/com/caimei365/commodity/controller/CouponApi.java

@@ -1,5 +1,6 @@
 package com.caimei365.commodity.controller;
 
+import com.caimei365.commodity.idempotent.Idempotent;
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.dto.CollarCouponsDto;
 import com.caimei365.commodity.model.dto.RedeemCouponsDto;
@@ -82,6 +83,7 @@ public class CouponApi {
 
     @ApiOperation("领取优惠券")
     @PostMapping("/collar")
+    @Idempotent(prefix = "idempotent_collarCoupons", keys = {"#couponsDto"}, expire = 5)
     public ResponseJson<String> collarCoupons(CollarCouponsDto couponsDto) {
         if (couponsDto.getCouponId() == null || couponsDto.getSource() == null || couponsDto.getUserId() == null) {
             return ResponseJson.error("参数异常", null);

src/main/java/com/caimei365/commodity/model/vo/CouponVo.java

@@ -33,13 +33,13 @@ public class CouponVo implements Serializable {
     /**
      * 使用开始时间（有效期）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startDate;
 
     /**
      * 使用结束时间（有效期）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
 
     /**

src/main/java/com/caimei365/commodity/service/impl/CouponServiceImpl.java

@@ -239,7 +239,9 @@ public class CouponServiceImpl implements CouponService {
                 }
                 if (coupon.getCouponType() == 3 && !coupon.getShopId().equals(product.getShopId())) {
                     iterator.remove();
+                    continue;
                 }
+                setShopName(coupon);
             }
         }
     }

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -801,7 +801,7 @@ public class PageServiceImpl implements PageService {
     @Override
     public Boolean setCouponsLogo(Integer userId, Integer productId, Integer source) {
         boolean couponsLogo = false;
-        ProductItemVo product = pageMapper.getProductItemById(productId);
+        ProductDetailVo product = pageMapper.getProductDetails(productId);
         List<CouponVo> couponList = pageMapper.findAllCoupon(userId);
         if (couponList != null && couponList.size() > 0) {
             for (CouponVo coupon : couponList) {