BUG:预约时间比较

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.impl;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.base.ErrorMapping;
@@ -20,9 +21,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataUnit;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -86,16 +89,16 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
                         return ResponseDto.failure("预约失败！");
                     }
                 } else {
-                    log.debug("skuId:{}，需要助力人数：{}，uid:{}，该用户未开启分享助力！",skuId,anticipateValueVo.getPeopleType(),uid);
+                    log.debug("skuId:{}，需要助力人数：{}，uid:{}，该用户未开启分享助力！", skuId, anticipateValueVo.getPeopleType(), uid);
                     return ResponseDto.failure("预约失败！");
                 }
             }
-            uidAboutBySkuId(skuId, uid,null);
+            uidAboutBySkuId(skuId, uid, null);
         }
         return ResponseDto.success();
     }
 
-    private void uidAboutBySkuId(String skuId, String uid,String avatar) {
+    private void uidAboutBySkuId(String skuId, String uid, String avatar) {
         GoblinGoodAnticipateUserVo user = new GoblinGoodAnticipateUserVo();
         user.setUid(uid);
         user.setSkuId(skuId);
@@ -121,7 +124,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         List<String> userAvatar = goblinRedisUtils.getUserAvatar(skuId);
         if (userAvatar != null && userAvatar.size() <= 2) {
             //获取预约人头像
-            if (avatar==null){
+            if (avatar == null) {
                 avatar = goblinAnticipateUtils.getUserInfo().getAvatar();
             }
             goblinRedisUtils.setUserAvatar(skuId, avatar);
@@ -151,8 +154,8 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         //可以创建分享
         //查询redis关联记录
         String sid = goblinRedisUtils.getShare(skuId, uid);
-        if (sid!=null) {
-            return ResponseDto.failure("0","已开启助力",sid);
+        if (sid != null) {
+            return ResponseDto.failure("0", "已开启助力", sid);
         } else {
             //查询sku需要助力人数
             //Integer skuIdPeople = goblinRedisUtils.getSharePeopleBySkuId(skuId);
@@ -179,7 +182,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
 
             //redis缓存
             Duration between = Duration.between(valueBySkuId.getAboutStartDate(), valueBySkuId.getAboutEndDate());
-            goblinRedisUtils.setShare(skuId, uid, sid,between.toDays());
+            goblinRedisUtils.setShare(skuId, uid, sid, between.toDays());
 
             //redis存储用户分享
             goblinRedisUtils.setShareVo(goblinGoodsAnticipateShareVo);
@@ -215,7 +218,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
         //获取uid
         String uid = CurrentUtil.getCurrentUid();
 
-        if (shareVo.getUid().equals(uid)){
+        if (shareVo.getUid().equals(uid)) {
             return ResponseDto.failure(ErrorMapping.get(150003));
         }
         //查询mongodb 是否助力过该分享
@@ -237,10 +240,10 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             if (helpUserAvatar.size() <= 6) {
                 //获取用户头像保存
                 AdamUserInfoVo userInfo = goblinAnticipateUtils.getUserInfo();
-                if (userInfo!=null){
+                if (userInfo != null) {
                     //新增助力头像
                     goblinRedisUtils.setHelpUserAvatar(sid, userInfo.getAvatar());
-                }else {
+                } else {
                     return ResponseDto.failure(ErrorMapping.get(150008));
                 }
             }
@@ -262,13 +265,13 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
             sendRedis("goblin_goods_anticipate_help", sqlValue);
 
             //判断主力人数是否达标，达标则自动预约
-            if (shareVo.getPeopleType().equals(goblinRedisUtils.getHelpSidAddHelp(sid))){
+            if (shareVo.getPeopleType().equals(goblinRedisUtils.getHelpSidAddHelp(sid))) {
                 //主力人数达到可预约条件
-                uidAboutBySkuId(shareVo.getSkuId(),shareVo.getUid(),shareVo.getAvatar());
+                uidAboutBySkuId(shareVo.getSkuId(), shareVo.getUid(), shareVo.getAvatar());
             }
             return ResponseDto.success();
-        }else {
-            log.debug("help()  false ------> sid:{}",sid);
+        } else {
+            log.debug("help()  false ------> sid:{}", sid);
             return ResponseDto.failure(ErrorMapping.get(150004));
         }
     }
@@ -295,7 +298,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
     public ResponseDto<Boolean> helpSid(String sid) {
         String uid = CurrentUtil.getCurrentUid();
         Integer help = goblinRedisUtils.getHelpByUidAndSid(uid, sid);
-        if (help == null){
+        if (help == null) {
             return ResponseDto.success(false);
         }
         return ResponseDto.success(true);
@@ -314,17 +317,17 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
     public ResponseDto<Boolean> reserveByMix(String mixId) {
         //获取udi
         String uid = CurrentUtil.getCurrentUid();
-        LocalDateTime now = LocalDateTime.now();
+        String nowTime = DateUtil.getNowTime();
         //redis查询用户预约组合购记录
         if (goblinRedisUtils.getReserveMixByUid(uid, mixId) == null) {
             //该混合狗能否被预约
             GoblinMixDetailsVo mixDetails = goblinRedisUtils.getMixDetails(mixId);
-            LocalDateTime st = LocalDateTime.parse(mixDetails.getTimeStart(), DTF_YMD_HMS);
             //组合购开启预约且当前时间大于预约购开始时间或者上架时间才可预约
-            if (mixDetails.getReserve() != 0 && now.isBefore(st)) {
+            if (mixDetails.getReserve() != 0 && DateUtil.compareStrDay(nowTime, mixDetails.getTimeStart()) <= 0) {
                 GoblinMixReserveVo goblinMixReserveVo = GoblinMixReserveVo.getNew();
                 goblinMixReserveVo.setMixId(mixId);
-                goblinMixReserveVo.setCreatedDate(now);
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtil.DATE_FULL_STR);
+                goblinMixReserveVo.setCreatedDate(LocalDateTime.parse(nowTime,formatter));
                 goblinMixReserveVo.setUid(uid);
                 String mobile = StringUtils.defaultString(((String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE)), "");
                 goblinMixReserveVo.setPhone(mobile);