通用券逻辑

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/RedisDataUtils.java

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,7 +24,7 @@ public class RedisDataUtils {
     RedisUtil redisUtil;
 
     // 获取 CandyUserCouponBasicDto数组 根据用户id
-    public List<CandyUserCouponBasicDto> getCouponByUid(String uid) {
+    public List<CandyUserCouponBasicDto> getCouponByUid(String uid, LocalDateTime userCreateTime) {
         String redisKey = CandyRedisConst.BASIC_USER_COUPON.concat(uid);
         String publicRedisKey = CandyRedisConst.BASIC_COMMON_COUPON;
 
@@ -47,14 +48,14 @@ public class RedisDataUtils {
         }
 
         boolean needSet = false;
+        if (userCreateTime == null) {
+            userCreateTime = LocalDateTime.MIN;
+        }
         List<String> userIds = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
-        log.info("userIds = "+userIds.toString());
         for (CandyCommonCouponBasicDto item : pubDto) {
-            log.info("pubDto = "+item.getCcouponId());
-            if (userIds.contains(item.getCcouponId())) {
+            if (userIds.contains(item.getCcouponId()) || userCreateTime.isAfter(item.getCreatedAt())) {
                 continue;
             } else {
-                log.info("pubDto = add");
                 CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copyToRedisCommonBaseCoupon(IDGenerator.get32UUID(), uid, item);
                 userDto.add(userCouponBasicDto);
                 needSet = true;