~api:我的券列表:整合公私券逻辑调整;

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

@@ -576,7 +576,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         params.add("uid", uid);
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
-        String returnData = HttpUtil.post(adamUrl.concat("/adam/rsc/inquire/createdAt"), params, headers);
+        String returnData = HttpUtil.get(adamUrl.concat("/adam/rsc/inquire/createdAt"), params, headers);
         return JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<LocalDateTime>>() {
         }).getData();
     }

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

@@ -63,24 +63,36 @@ public class RedisDataUtils {
             pubDto = (List<CandyCommonCouponBasicDto>) obj2;
         }
 
-        boolean needSet = false;
+//        boolean needSet = false;
+//        if (userCreateTime == null) {
+//            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+//        }
+//        List<String> userCcouponIdList = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
+//        if (userCcouponIdList.size() > 0) {
+//            for (CandyCommonCouponBasicDto item : pubDto) {
+//                if (userCcouponIdList.contains(item.getCcouponId()) || userCreateTime.isAfter(item.getCreatedAt())) {
+//                    continue;
+//                } else {
+//                    CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copyToRedisCommonBaseCoupon(IDGenerator.get32UUID(), uid, item);
+//                    userDto.add(userCouponBasicDto);
+//                    needSet = true;
+//                }
+//            }
+//        }
+//        if (needSet) {
+//            setCouponByUid(uid, userDto);
+//        }
         if (userCreateTime == null) {
-            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
+            userCreateTime = LocalDateTime.of(2222, 1, 1, 0, 0, 0);
         }
-        List<String> userIds = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
-        if (userIds!=null && userIds.size() > 0) {
-            for (CandyCommonCouponBasicDto item : pubDto) {
-                if (userIds.contains(item.getCcouponId()) || userCreateTime.isAfter(item.getCreatedAt())) {
-                    continue;
-                } else {
-                    CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copyToRedisCommonBaseCoupon(IDGenerator.get32UUID(), uid, item);
-                    userDto.add(userCouponBasicDto);
-                    needSet = true;
-                }
+        List<String> userCcouponIdList = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
+        for (CandyCommonCouponBasicDto item : pubDto) {
+            if (userCcouponIdList.contains(item.getCcouponId()) || userCreateTime.isAfter(item.getCreatedAt())) {
+                continue;
             }
-        }
-        if (needSet) {
-            setCouponByUid(uid, userDto);
+            String ucouponId = item.getCcouponId().concat("-").concat(uid);
+            CandyUserCouponBasicDto userCouponBasicDto = CandyUserCouponBasicDto.getNew().copyToRedisCommonBaseCoupon(ucouponId, uid, item);
+            userDto.add(userCouponBasicDto);
         }
         return userDto;
     }