修改bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRecommendActiveController.java

@@ -68,6 +68,9 @@ public class KylinRecommendActiveController extends BaseController {
     @ApiOperation(value = "增加或者修改活动推荐List")
     @ResponseBody
     public AjaxResult addOrUpdateListKylinRecommendActiveRelation(@RequestBody List<KylinRecommendActiveRelationParam> kylinRecommendActiveParam) {
+        if(kylinRecommendActiveParam.size()>20){
+            return AjaxResult.error("操作失败", "推荐活动不允许超过20个！！！");
+        }
         List<KylinRecommendActiveRelation> list=new ArrayList<>();
         for(KylinRecommendActiveRelationParam ky:kylinRecommendActiveParam){
             KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRecommendActiveServiceImpl.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.kylin.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.StringUtil;
 import com.liquidnet.service.goblin.dto.manage.vo.AnticipateValueVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
@@ -21,9 +20,13 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigInteger;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
 
 /**
  *
@@ -105,6 +108,7 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
                         if (null != goblinMixAppDetailsVo) {
                             com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo aNew = com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo.getNew();
                             BeanUtils.copyProperties(goblinMixAppDetailsVo, aNew);
+                            if(StringUtil.isBlank(aNew.getShelvesTime()))aNew.setShelvesTime(aNew.getTimeStart());
                             if(goblinMixAppDetailsVo.getStatus()!=7&&comparTime(aNew.getShelvesTime(),aNew.getTimeEnd())){
                                 kylinRecommendActiveRelationVo.setGoblinMixAppDetailsVo(aNew);
                                 kylinRecommendActiveRelationVo.setCount(true);
@@ -177,11 +181,18 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
     }
     public boolean comparTime(String startTime,String endTime) throws ParseException {
         if(StringUtil.isNotBlank(startTime)&&StringUtil.isNotBlank(endTime)){
-            SimpleDateFormat sdf = DateUtil.SDF_YMD_HMS;
-            Date d= new Date();
-            if(d.compareTo(sdf.parse(startTime))>0&&d.compareTo(sdf.parse(endTime))<0){
+            LocalDateTime nt = LocalDateTime.now();
+            LocalDateTime st = LocalDateTime.parse(startTime, DTF_YMD_HMS);
+            LocalDateTime et = LocalDateTime.parse(endTime, DTF_YMD_HMS);
+           /* SimpleDateFormat sdf = DateUtil.SDF_YMD_HMS;*/
+           // LocalDateTime d = LocalDateTime.now();
+           /* Date d= new Date();*/
+            if(nt.isAfter(st)&&nt.isBefore(et)){
                 return true;
             }
+           /* if(d.compareTo(sdf.parse(startTime))>0&&d.compareTo(sdf.parse(endTime))<0){
+                return true;
+            }*/
         }
         return false;
     }
@@ -319,14 +330,18 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
             vo.setStatus(8);
         } else {
             LocalDateTime nt = LocalDateTime.now();
-            LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DateUtil.DTF_YMD_HMS);
-            LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DateUtil.DTF_YMD_HMS);
-            if (nt.isBefore(st)) {
-                vo.setStatus(9);
-            } else if (nt.isAfter(et)) {
-                vo.setStatus(10);
+            LocalDateTime st = LocalDateTime.parse(vo.getTimeStart(), DTF_YMD_HMS);
+            LocalDateTime et = LocalDateTime.parse(vo.getTimeEnd(), DTF_YMD_HMS);
+            if (baseVo.getStatus() == 7) {
+                vo.setStatus(7);
             } else {
-                vo.setStatus(6);
+                if (nt.isBefore(st)) {
+                    vo.setStatus(9);
+                } else if (nt.isAfter(et)) {
+                    vo.setStatus(10);
+                } else {
+                    vo.setStatus(6);
+                }
             }
         }
         return vo;