Merge branch 'dev_notice_0708' into dev_0716_online

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -7,6 +7,7 @@ public class KylinRedisConst {
     public static final String PERFORMANCES_LIST_CITY = "kylin:performances:city:";
     public static final String PERFORMANCES_LIST_SYSTEM_RECOMMEND = "kylin:performances:systemRecommend";
     public static final String PERFORMANCES_LIST_NOTICE = "kylin:performances:notice";
+    public static final String PERFORMANCES_LIST_NOTICE_IDS = "kylin:performances:notice:ids";
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_LIST_EXCLUSIVE = "kylin:performances:exclusive";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java

@@ -24,4 +24,5 @@ public interface IKylinPerformancesService {
     ResponseDto<String> subscribe(String performancesId, Integer sourceType);
 
     ResponseDto<Integer> isSubscribe(String performancesId);
+
 }

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java

@@ -52,4 +52,8 @@ public interface FeignKylinForChimeClient {
     ResponseDto<KylinPerformanceVo> getDetail(
             @RequestParam("performancesId") String performancesId
     );
+
+
+    @GetMapping("inner/setNoticeIds")
+    ResponseDto<HashMap<String,Object>> setNoticeIds();
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
+import com.liquidnet.service.feign.kylin.api.FeignKylinForChimeClient;
 import com.liquidnet.service.feign.kylin.task.FeignPlatformTaskClient;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -19,6 +20,9 @@ public class KylinTaskHandler {
     @Autowired
     private FeignPlatformTaskClient feignPlatformTaskClient;
 
+    @Autowired
+    private FeignKylinForChimeClient feignKylinForChimeClient;
+
     @XxlJob(value = "sev-platform:checkOrderTimeHandler")
     public void checkOrderTimeHandler() {
         try {
@@ -68,4 +72,14 @@ public class KylinTaskHandler {
             XxlJobHelper.handleFail();
         }
     }
+
+    @XxlJob(value = "sev-platform:setNoticeIds")
+    public void setNoticeIds() {
+        try {
+            XxlJobHelper.handleSuccess("结果：" + feignKylinForChimeClient.setNoticeIds().getData());
+        } catch (Exception e) {
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -38,6 +38,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-goblin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -6,6 +6,8 @@ import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.service.IKylinPerformancesService;
+import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
 
 @Api(tags = "内部接口")
 @RestController
@@ -32,6 +35,9 @@ public class InnerController {
     @Value("${liquidnet.adam.url}")
     private String adamUrl;
 
+    @Autowired
+    private KylinPerformancesServiceImpl kylinPerformancesService;
+
     @GetMapping("cache/member/{uid}")
     @ApiOperation("获取会员相关数据")
     public void cacheMember(@NotBlank @PathVariable(value = "uid") String uid) {
@@ -62,4 +68,11 @@ public class InnerController {
         }
     }
 
+    @GetMapping("/setNoticeIds")
+    @ApiOperation("演出预告列表定时任务")
+    public ResponseDto<HashMap<String,Object>> setNoticeIds(){
+        HashMap<String, Object> map = kylinPerformancesService.setNoticeIds();
+        return ResponseDto.success(map);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
+import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -152,6 +153,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> performancesListNotice = dataUtils.getPerformancesListNotice();
         List<KylinPerformanceVo> toDayList = (List<KylinPerformanceVo>) performancesListNotice.get("toDayList");
         List<KylinPerformanceVo> threeDaysList = (List<KylinPerformanceVo>) performancesListNotice.get("threeDaysList");
+        List<GoblinGoodsSkuInfoVo> toDaysNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
+        List<GoblinGoodsSkuInfoVo> threeNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeNftList");
+        List<GoblinGoodsSkuInfoVo> toDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDayCombinationList");
+        List<GoblinGoodsSkuInfoVo> threeDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeDayCombinationList");
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);
@@ -163,9 +168,17 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
         newList.put("threeDaysList", threeDaysList);
+        newList.put("toDaysNftList",toDaysNftList);
+        newList.put("threeNftList",threeNftList);
+        newList.put("toDayCombinationList",toDayCombinationList);
+        newList.put("threeDayCombinationList",threeDayCombinationList);
         return newList;
     }
 
+    public HashMap<String,Object> setNoticeIds() {
+        return dataUtils.setNoticeIds();
+    }
+
     private List<KylinPerformanceVo> mergeRoadList(List<KylinPerformanceVo> performanceList) {
         List<String> roadIdList = new ArrayList<>();
         List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();