BUG:预约时间比较

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

@@ -152,8 +152,8 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
         List<GoblinMixDetailsItemVo> itemList = ObjectUtil.goblinMixDetailsItemVo();
         List<GoblinMixDetailsItemParam> itemParams = param.getItem();
         //开启预约 判断上架时间必须大于开始时间
-        if (DateUtil.compareStrDay(param.getShelvesTime(), param.getTimeStart()) >= 0) {
-            return ResponseDto.failure("上架时间必须小于开始时间！");
+        if (param.getReserve() != 0 && DateUtil.compareStrDay(param.getShelvesTime(), param.getTimeStart()) < 0) {
+            return ResponseDto.failure("售卖时间不能超过上架时间！");
         }
 
         //判断活动名称
@@ -221,8 +221,8 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
         GoblinMixDetailsVo vo = redisUtils.getMixDetails(param.getMixId());
         String oldWhiteUrl = vo.getWhiteUrl();
         //开启预约 判断上架时间必须大于开始时间
-        if (DateUtil.compareStrDay(param.getShelvesTime(), vo.getTimeStart()) >= 0) {
-            return ResponseDto.failure("上架时间必须小于开始时间！");
+        if (param.getReserve() != 0 && DateUtil.compareStrDay(param.getShelvesTime(), vo.getTimeStart()) < 0) {
+            return ResponseDto.failure("售卖时间不能超过上架时间！");
         }
 
         if (!vo.getUserId().equals(uid)) {