Merge remote-tracking branch 'origin/dev' into dev

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

@@ -36,7 +36,7 @@ public class KylinPerformancesAdminController {
     @PostMapping(value = "list")
     @ApiOperation(value = "获取列表")
     @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<PerformanceAdminListDao>> performanceDetails(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
+    public ResponseDto<PageInfo<PerformanceAdminListDao>> getList(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
         PageInfo<PerformanceAdminListDao> result = null;
         result = performancesAdminService.getList(performanceAdminListParam);
         if (null != result) {
@@ -59,10 +59,10 @@ public class KylinPerformancesAdminController {
         }
     }
 
-    @GetMapping(value = "audit")
+    @PostMapping(value = "audit")
     @ApiOperation(value = "演出审核")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> performanceDetails(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt" , required = false) String rejectTxt) {
+    public ResponseDto<String> performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt" , required = false) String rejectTxt) {
         boolean result = performancesAdminService.performanceAudit(performancesId, status, rejectTxt);
         if (result) {
             return ResponseDto.success("审核完成");
@@ -98,7 +98,7 @@ public class KylinPerformancesAdminController {
     @GetMapping(value = "roadShow/relation")
     @ApiOperation(value = "修改演出巡演关联")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> getListByStatus(@RequestParam("performanceId") String performanceId, @RequestParam("roadShowId") String roadShowId) {
+    public ResponseDto<String> changeRoadShowId(@RequestParam("performanceId") String performanceId, @RequestParam("roadShowId") String roadShowId) {
         boolean result = performancesAdminService.changeRoadShowId(performanceId, roadShowId);
         if (result) {
             return ResponseDto.success("操作成功");

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

@@ -17,6 +17,9 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 巡演 前端控制器
@@ -36,7 +39,7 @@ public class KylinRoadShowsAdminController {
     @GetMapping(value = "list")
     @ApiOperation(value = "获取列表")
     @ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<RoadShowAdminListDao>> performanceDetails(@RequestParam(value = "title",required = false) String title,
+    public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
                                                                           @RequestParam(value = "page") int page,
                                                                           @RequestParam(value = "size") int size) {
         PageInfo<RoadShowAdminListDao> result = null;
@@ -51,10 +54,12 @@ public class KylinRoadShowsAdminController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
+    public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
         String result = roadShowsService.createRoadShow(createRoadShowParam);
         if (!result.isEmpty()) {
-            return ResponseDto.success(result);
+            Map<String,String> map = new HashMap<>();
+            map.put("roadShowId",result);
+            return ResponseDto.success(map);
         } else {
             return ResponseDto.failure("创建失败");
         }

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

@@ -30,7 +30,7 @@ public class KylinTicketTimesPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次")
     @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
         TicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
         if (null == result) {
@@ -55,7 +55,7 @@ public class KylinTicketTimesPartnerController {
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次")
     @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+    public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
         TicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.changeTimes(createTicketTimesParam);
         if (null == result) {

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

@@ -30,7 +30,7 @@ public class KylinTicketsPartnerController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务")
     @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody TicketCreateParam ticketCreateParam) {
         TicketPartnerVo result = null;
         result = ticketsPartnerService.createTicketSummary(ticketCreateParam);
         if (null == result) {

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

@@ -12,6 +12,9 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Api(tags = "第三方-演出")
 @RestController
 @RequestMapping("partner/performance")
@@ -34,14 +37,16 @@ public class PerformancePartnerController {
     }
 
     @PostMapping(value = "copy")
-    @ApiOperation(value = "演出列表")
+    @ApiOperation(value = "复制演出")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> copyPerformance(@RequestParam("performancesId") String performancesId) {
+    public ResponseDto<Map<String,String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
         String result = performancesPartnerService.copyPerformance(performancesId);
         if (null == result) {
             return ResponseDto.failure("复制失败");
         } else {
-            return ResponseDto.success(result);
+            Map<String,String> map = new HashMap<>();
+            map.put("performancesId",result);
+            return ResponseDto.success(map);
         }
     }
 
@@ -61,12 +66,14 @@ public class PerformancePartnerController {
     @PostMapping(value = "step1")
     @ApiOperation(value = "操作演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
+    public ResponseDto<Map<String,String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
         String result = performancesPartnerService.step1(performanceStep1Param);
         if (result.isEmpty()) {
             return ResponseDto.failure("操作失败");
         } else {
-            return ResponseDto.success(result);
+            Map<String,String> map = new HashMap<>();
+            map.put("performancesId",result);
+            return ResponseDto.success(map);
         }
     }