修改bug

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -138,6 +138,7 @@ global-auth:
     - ${liquidnet.info.context}/performance/calendarPerformances
     - ${liquidnet.info.context}/performance/*
     - ${liquidnet.info.context}/myPerformance/*
+    - ${liquidnet.info.context}/recommendActive/*
     # 场地摄像头列表
     - ${liquidnet.info.context}/camera/list
     - ${liquidnet.info.context}/inner/**

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

@@ -5,14 +5,17 @@ import com.liquidnet.service.kylin.dto.vo.KylinRecommendActiveRelationVo;
 import com.liquidnet.service.kylin.dto.vo.KylinRecommendActiveVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinRecommendActive;
+import com.liquidnet.service.kylin.entity.KylinRecommendActiveRelation;
 import com.liquidnet.service.kylin.service.IKylinRecommendActiveService;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import com.liquidnet.service.kylin.utils.KylinRedisUtils;
+import com.liquidnet.service.kylin.utils.ObjectUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -33,6 +36,13 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
             if(LocalDateTime.now().isAfter(kylinRecommendActive.getStartTime())&&LocalDateTime.now().isBefore(kylinRecommendActive.getEndTime())){
                 KylinRecommendActiveVo kylinRecommendActiveVo = KylinRecommendActiveVo.getNew();
                 BeanUtils.copyProperties(kylinRecommendActive,kylinRecommendActiveVo);
+                ArrayList<KylinRecommendActiveRelationVo> kylinRecommendActiveRelationVoList = ObjectUtil.getKylinRecommendActiveRelationVo();
+                for(KylinRecommendActiveRelation ky:kylinRecommendActive.getList()){
+                    KylinRecommendActiveRelationVo aNew = KylinRecommendActiveRelationVo.getNew();
+                    BeanUtils.copyProperties(ky,aNew);
+                    kylinRecommendActiveRelationVoList.add(aNew);
+                }
+                kylinRecommendActiveVo.setList(kylinRecommendActiveRelationVoList);
             /*    if(StringUtil.isNotBlank(kylinRecommendActiveVo.getActiveBindId())&&null !=kylinRecommendActiveVo.getActiveType()){
                     //找到绑定的详情
                     if(kylinRecommendActiveVo.getActiveType()==3){

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

@@ -13,6 +13,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
+import com.liquidnet.service.kylin.entity.KylinRecommendActiveRelation;
 import com.mongodb.client.model.WriteModel;
 import org.bson.Document;
 
@@ -38,10 +39,16 @@ public class ObjectUtil {
     private static final ArrayList<KylinCandyVo> kylinCandyVos = new ArrayList<>();
     private static final ArrayList<GoblinListCollectVo> goblinListCollectVo = new ArrayList<>();
     private static final ArrayList<KylinRecommendActiveRelationVo> kylinRecommendActiveRelationVos=new  ArrayList<>();
+    private static final ArrayList<KylinRecommendActiveRelation>  kylinRecommendActiveRelationList=new ArrayList<>();
     private static final ArrayList<NoticeGoblinGoodsSkuInfoVo> noticeGoblinGoodsSkuInfoVoArrayList = new ArrayList<>();
     private static final ArrayList<NoticeGoblinMixDetailsVo> noticeGoblinMixDetailsVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinMixDetailsVo> goblinMixDetailsVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
+
+
+    public static ArrayList<KylinRecommendActiveRelation> getKylinRecommendActiveRelation() {
+        return (ArrayList<KylinRecommendActiveRelation>) kylinRecommendActiveRelationList.clone();
+    }
     public static ArrayList<KylinCandyVo> kylinCandyVos() {
         return (ArrayList<KylinCandyVo>) kylinCandyVos.clone();
     }