修改演出规则

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

@@ -36,6 +36,8 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
     private KylinRedisUtils kylinRedisUtils;
     @Autowired
     private GoblinOrderUtils goblinOrderUtils;
+    @Autowired
+    private KylinPerformancesServiceImpl kylinPerformancesService;
 
     @Override
     public KylinRecommendActiveVo getRecommendById(List<KylinRecommendActive> list) throws ParseException {
@@ -118,7 +120,11 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
                         //演出
                         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(kylinRecommendActiveRelationVo.getRecommendBindId());
                         if(null!=performancesInfo){
-                            if(performancesInfo.getAppStatus()!=7&&performancesInfo.getAppStatus()!=10){
+                            List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
+                            newList.add(performancesInfo);
+                            List<KylinPerformanceVo> kylinPerformanceVos = kylinPerformancesService.checkAppStatus(newList);
+                            if(null!=kylinPerformanceVos&&kylinPerformanceVos.size()>0){
+                                performancesInfo=kylinPerformanceVos.get(0);
                                 kylinRecommendActiveRelationVo.setKylinPerformanceVo(performancesInfo);
                                 kylinRecommendActiveRelationVo.setCount(true);
                             }else{
@@ -129,6 +135,18 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
                             kylinRecommendActiveRelationVo.setCount(false);
                             iterator.remove();
                         }
+                      /*  if(null!=performancesInfo){
+                            if(performancesInfo.getAppStatus()!=7&&performancesInfo.getAppStatus()!=10){
+                                kylinRecommendActiveRelationVo.setKylinPerformanceVo(performancesInfo);
+                                kylinRecommendActiveRelationVo.setCount(true);
+                            }else{
+                                kylinRecommendActiveRelationVo.setCount(false);
+                                iterator.remove();
+                            }
+                        }else{
+                            kylinRecommendActiveRelationVo.setCount(false);
+                            iterator.remove();
+                        }*/
                     } else if (kylinRecommendActiveRelationVo.getType() == 4) {
                         //商品               //商品
                         GoblinGoodsInfoVo goblinGoodsInfoVo = kylinRedisUtils.getGoodsInfoVo(kylinRecommendActiveRelationVo.getRecommendBindId());