演出预告type

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

@@ -81,8 +81,11 @@ public class KylinPerformancesController {
 
     @GetMapping("noticeList")
     @ApiOperation("演出预告列表")
-    public ResponseDto<HashMap<String, Object>> noticeList() {
-        HashMap<String, Object> result = kylinPerformancesService.noticeList();
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "type为1的时候合并巡演")
+    })
+    public ResponseDto<HashMap<String, Object>> noticeList(@RequestParam Integer type) {
+        HashMap<String, Object> result = kylinPerformancesService.noticeList(type);
         return ResponseDto.success(result);
     }
 

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

@@ -135,7 +135,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         return info;
     }
 
-    public HashMap<String, Object> noticeList() {
+    public HashMap<String, Object> noticeList(Integer type) {
         /*if (-1 != DateUtil.compareStrDay(timeStart, toDayEndTimeStr) && -1 == DateUtil.compareStrDay(timeStart, threeDaysLaterStr)) {
             threeDaysList.add(info);
         }*/