券查询降级;

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.xml

@@ -43,7 +43,7 @@
     <sql id="Rst_CommonCouponBasicDto_Column_List">
         cc.coupon_id, cc.title, cc.`label`, cc.notice, cc.`exclusive`, cc.busi_type, cc.cou_type, cc.bind_type,
         cc.discount, cc.val_face, cc.val_over, cc.val_minus, cc.`overlay`, cc.overlay_level,
-        cc.validity, cc.redeem_validity, cc.redeem_start, cc.redeem_stop, cc.effect_at, cc.expire_at
+        cc.validity, cc.redeem_validity, cc.redeem_start, cc.redeem_stop, cc.effect_at, cc.expire_at,
 
         ccc.ccoupon_id, ccc.mcoupon_id, ccc.`state`, ccc.ranged, ccc.created_at
     </sql>

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCouponRuleMapper.xml

@@ -28,7 +28,7 @@
         WHERE state = 1
         <if test="couponIdList != null and couponIdList.size() > 0">
             <foreach collection="couponIdList" item="couponId" open="AND coupon_id IN (" separator="," close=")">
-                $(couponId)
+                ${couponId}
             </foreach>
         </if>
         ORDER BY coupon_id

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/PlatformCandyDemoteController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.controller.candy;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -28,15 +30,15 @@ public class PlatformCandyDemoteController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "用户私有券")
     @PostMapping("ucoupon")
-    public ResponseDto<List<CandyUserCouponBasicDto>> queryForUserCouponBasicDto() {
-        return ResponseDto.success(platformCandyUserCouponService.ucouponBasicDtoByUidProcessing(CurrentUtil.getCurrentUid()));
+    public ResponseDto<List<CandyUserCouponBasicDto>> queryForUserCouponBasicDto(@RequestParam String currentUid) {
+        return ResponseDto.success(platformCandyUserCouponService.ucouponBasicDtoByUidProcessing(currentUid));
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "用户公有券")
     @PostMapping("ccoupon")
-    public ResponseDto<List<CandyCommonCouponBasicDto>> queryForCommonCouponBasicDto() {
-        LocalDateTime ucreatedAt = (LocalDateTime) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED);
+    public ResponseDto<List<CandyCommonCouponBasicDto>> queryForCommonCouponBasicDto(@RequestParam String ucreatedAtStr) {
+        LocalDateTime ucreatedAt = DateUtil.Formatter.yyyyMMddHHmmss.parse(ucreatedAtStr);
         return ResponseDto.success(platformCandyUserCouponService.ccouponBasicDtoByUidProcessing(ucreatedAt));
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -2,8 +2,10 @@ package com.liquidnet.service.platform.service.impl.candy;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.base.OrderCloseMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.candy.constant.CandyRedisConst;
 import com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto;
 import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
@@ -35,6 +37,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     private PlatformCandyUserCouponService platformCandyUserCouponService;
     @Autowired
     private QueueUtils queueUtils;
+    @Autowired
+    private RedisUtil redisUtil;
 
     /**
      * @param uCouponUidList 内容 uCouponId,uid List
@@ -78,6 +82,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
             basicDtoList.parallelStream().forEach(dto -> {
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
+
+            redisUtil.set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
         }
         return basicDtoList;
     }
@@ -94,6 +100,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
             basicDtoList.parallelStream().forEach(dto -> {
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
+
+            redisUtil.set(CandyRedisConst.BASIC_COMMON_COUPON, basicDtoList);
         }
         return basicDtoList;
     }