+我的券-公有券根据券生成日期与用户创建时间判断是否展示;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java

@@ -17,6 +17,7 @@ public class CurrentUtil {
     public static final String TOKEN_MOBILE = "mobile";
     public static final String TOKEN_NICKNAME = "nickname";
     public static final String TOKEN_TYPE = "type";
+    public static final String TOKEN_UCREATED = "c_at";
     public static final String TOKEN_TYPE_VAL_USER = "user";
     public static final String TOKEN_TYPE_VAL_STATION = "station";
 

liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/CandyCommonCouponBasicDto.java

@@ -36,7 +36,7 @@ public class CandyCommonCouponBasicDto implements Serializable ,Cloneable{
     private LocalDateTime effectAt;
     private LocalDateTime expireAt;
     //private String operator;
-    //private Date createdAt;
+    private LocalDateTime createdAt;
     //private Date updatedAt;
     //private String comment;
 
@@ -84,6 +84,7 @@ public class CandyCommonCouponBasicDto implements Serializable ,Cloneable{
         this.setRedeemStop(coupon.getRedeemStop());
         this.setEffectAt(coupon.getEffectAt());
         this.setExpireAt(coupon.getExpireAt());
+        this.setCreatedAt(coupon.getCreatedAt());
 
         this.setCcouponId(commonCoupon.getCcouponId());
         this.setMcouponId(commonCoupon.getMcouponId());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -409,6 +409,7 @@ public class AdamLoginController {
         claimsMap.put(CurrentUtil.TOKEN_MOBILE, userInfoVo.getMobile());
         claimsMap.put(CurrentUtil.TOKEN_NICKNAME, userInfoVo.getNickname());
         claimsMap.put(CurrentUtil.TOKEN_TYPE, CurrentUtil.TOKEN_TYPE_VAL_USER);
+        claimsMap.put(CurrentUtil.TOKEN_UCREATED, userInfoVo.getCreateAt());
 
         log.debug("Gentoken:{}", claimsMap);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -211,10 +211,11 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
     private String flushSsoProcess(AdamUserInfoVo userInfoVo) {
         Map<String, Object> claimsMap = CollectionUtil.mapStringObject();
-        claimsMap.put("sub", userInfoVo.getUid());
-        claimsMap.put("mobile", userInfoVo.getMobile());
-        claimsMap.put("nickname", userInfoVo.getNickname());
-        claimsMap.put("type", "user");
+        claimsMap.put(CurrentUtil.TOKEN_SUB, userInfoVo.getUid());
+        claimsMap.put(CurrentUtil.TOKEN_MOBILE, userInfoVo.getMobile());
+        claimsMap.put(CurrentUtil.TOKEN_NICKNAME, userInfoVo.getNickname());
+        claimsMap.put(CurrentUtil.TOKEN_TYPE, CurrentUtil.TOKEN_TYPE_VAL_USER);
+        claimsMap.put(CurrentUtil.TOKEN_UCREATED, userInfoVo.getCreateAt());
 
         String token = jwtValidator.create(claimsMap);
 

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

@@ -175,9 +175,8 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
     private void processForAllMember(CandyMgtCoupon mgtCoupon, CandyCoupon coupon, List<CandyCouponRuleDto> couponRuleDtoList) {
         List<CandyUserCoupon> initUserCouponList = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime duedAt = now.plusDays(coupon.getValidity()).withHour(23).withMinute(59).withSecond(59);
-
         LocalDateTime nowEndTime = now.withHour(23).withMinute(59).withSecond(59);
+
         LambdaQueryWrapper<AdamUserMember> queryWrapper = Wrappers.lambdaQuery(AdamUserMember.class).eq(AdamUserMember::getState, 1)
                 .gt(AdamUserMember::getExpiryAt, nowEndTime);
         int userMemberCount = platformAdamUserMemberService.count(queryWrapper), num = 0, pSize = 1000;
@@ -204,8 +203,8 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setUid(userMember.getUid());
                     userCoupon.setCouponId(coupon.getCouponId());
                     userCoupon.setState(1);
-                    userCoupon.setBindAt(now);
-                    userCoupon.setDuedAt(duedAt);
+                    userCoupon.setBindAt(coupon.getEffectAt());
+                    userCoupon.setDuedAt(coupon.getExpireAt());
                     userCoupon.setCreatedAt(now);
 
                     initUserCouponList.add(userCoupon);
@@ -249,7 +248,6 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
     private void processForUserCoupon(CandyMgtCoupon mgtCoupon, CandyCoupon coupon, List<CandyCouponRuleDto> couponRuleDtoList) {
         List<CandyUserCoupon> initUserCouponList = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime duedAt = now.plusDays(coupon.getValidity()).withHour(23).withMinute(59).withSecond(59);
 
         String eventLimit = mgtCoupon.getEventLimit();
         String[] eventLimitArr = eventLimit.split(",");
@@ -267,8 +265,8 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                     userCoupon.setUid(uid);
                     userCoupon.setCouponId(coupon.getCouponId());
                     userCoupon.setState(1);
-                    userCoupon.setBindAt(now);
-                    userCoupon.setDuedAt(duedAt);
+                    userCoupon.setBindAt(coupon.getEffectAt());
+                    userCoupon.setDuedAt(coupon.getExpireAt());
                     userCoupon.setCreatedAt(now);
 
                     initUserCouponList.add(userCoupon);

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

@@ -2,27 +2,30 @@ 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.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.OrderCloseMapping;
-import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
 import com.liquidnet.service.candy.entity.CandyUserCoupon;
+import com.liquidnet.service.candy.mapper.CandyCouponRuleMapper;
 import com.liquidnet.service.candy.mapper.CandyUserCouponMapper;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.platform.utils.QueueUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponMapper, CandyUserCoupon> {
-
+    @Autowired
+    private CandyUserCouponMapper candyUserCouponMapper;
+    @Autowired
+    private CandyCouponRuleMapper candyCouponRuleMapper;
     @Autowired
     private PlatformCandyUserCouponService platformCandyUserCouponService;
     @Autowired
@@ -55,4 +58,23 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
         }
         return true;
     }
+
+    public List<CandyUserCouponBasicDto> ucouponByUidProcessing(String uid) {
+        List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
+        if (!CollectionUtils.isEmpty(basicDtoList)) {
+            List<String> couponIdList = basicDtoList.parallelStream().map(CandyUserCouponBasicDto::getCouponId).collect(Collectors.toList());
+
+            List<CandyCouponRuleDto> couponRuleDtoList = candyCouponRuleMapper.selectForCouponRuleDto(couponIdList);
+
+            Map<String, List<CandyCouponRuleDto>> couponRuleDtoListMap = couponRuleDtoList.parallelStream().collect(Collectors.groupingBy(CandyCouponRuleDto::getCouponId));
+
+//            Map<String, List<CandyUserCouponBasicDto>> basicDtoListMap = basicDtoList.parallelStream().collect(Collectors.groupingBy(CandyUserCouponBasicDto::getCouponId));
+
+            basicDtoList.parallelStream().forEach(dto -> {
+                dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
+            });
+        }
+
+        return null;
+    }
 }