暂时提交

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/ticketSystem/TicketSystemController.java

@@ -29,25 +29,25 @@ public class TicketSystemController {
     @Autowired
     ITicketSystemService ticketSystemService;
 
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
+    @PostMapping("type/list")
+    @ApiOperation("查询标准演出类型")
     public ResponseDto<List<STPTListVo>> getPerformanceTypeList() {
         String accessToken = ticketSystemService.getAccessToken();
         List<STPTListVo> vo = ticketSystemService.getPerformanceTypeList(accessToken);
         return ResponseDto.success(vo);
     }
 
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
+    @PostMapping("field/list")
+    @ApiOperation("查询标准演出场所")
     public ResponseDto<List<STFieldListVo>> getFieldList(STFieldListParam fieldListParam) {
         String accessToken = ticketSystemService.getAccessToken();
         List<STFieldListVo> vo = ticketSystemService.getFieldList(accessToken, fieldListParam);
         return ResponseDto.success(vo);
     }
 
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
-    public ResponseDto<STFieldChangeVo> getFieldList(STInsertFieldParam insertFieldParam) {
+    @PostMapping("field/insert")
+    @ApiOperation("新增演出场厅")
+    public ResponseDto<STFieldChangeVo> insertField(STInsertFieldParam insertFieldParam) {
         String accessToken = ticketSystemService.getAccessToken();
         STFieldChangeVo vo = ticketSystemService.insertField(accessToken, insertFieldParam);
         return ResponseDto.success(vo);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/param/ticketSystem/STInsertPerformanceParam.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-@ApiModel(value = "STInsertFieldParam",description = "详情")
+@ApiModel(value = "STInsertPerformanceParam",description = "详情")
 public class STInsertPerformanceParam {
     @ApiModelProperty(value = "演出活动ID")
     String performanceId;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/param/ticketSystem/STInsertTicketPriceParam.java

+package com.liquidnet.service.platform.param.ticketSystem;
+
+import com.liquidnet.service.platform.vo.ticketSystem.TicketPriceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "STInsertTicketPriceParam", description = "详情")
+public class STInsertTicketPriceParam {
+    @ApiModelProperty(value = "场次编码")
+    String sessionCode;
+    @ApiModelProperty(value = "票价信息数组")
+    List<TicketPriceVo> priceList;
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/param/ticketSystem/STUpdatePerformanceParam.java

+package com.liquidnet.service.platform.param.ticketSystem;
+
+import com.liquidnet.service.platform.vo.ticketSystem.TimesVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "STUpdatePerformanceParam", description = "详情")
+public class STUpdatePerformanceParam {
+    @ApiModelProperty(value = "演出ID")
+    String performanceId;
+    @ApiModelProperty(value = "演出名称")
+    String performanceName;
+    @ApiModelProperty(value = "演出描述")
+    String performanceDesc;
+    @ApiModelProperty(value = "演出类型")
+    Integer typeId;
+    @ApiModelProperty(value = "演出封面图")
+    String posterUrl;
+    @ApiModelProperty(value = "主办方，多个用英文逗号分隔")
+    String sponsor;
+    @ApiModelProperty(value = "演员，多个用英文逗号分隔")
+    String performer;
+    @ApiModelProperty(value = "批文号")
+    String approval;
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/param/ticketSystem/STUpdateTimesParam.java

+package com.liquidnet.service.platform.param.ticketSystem;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(value = "STUpdateTimesParam",description = "详情")
+public class STUpdateTimesParam {
+    @ApiModelProperty(value = "演出场次ID")
+    String sessionId;
+    @ApiModelProperty(value = "演出场次编码")
+    String sessionCode;
+    @ApiModelProperty(value = "场次名称")
+    String sessionName;
+    @ApiModelProperty(value = "场次开始时间")
+    LocalDateTime sessionStartTime;
+    @ApiModelProperty(value = "场次结束时间")
+    java.time.LocalDateTime sessionEndTime;
+    @ApiModelProperty(value = "场厅编码")
+    String hallCode;
+    @ApiModelProperty(value = " 是否有座，0：无座1：有座")
+    Integer hasSeat;
+    @ApiModelProperty(value = "演出ID")
+    String performanceId;
+    @ApiModelProperty(value = "场次状态，1 正常，2 取消")
+    Integer sessionStatus;
+    @ApiModelProperty(value = " 标记，0:正式，1:测试")
+    Integer tag;
+    @ApiModelProperty(value = "票图URL")
+    String seatingChart;
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/ticketSystem/ITicketSystemService.java

 package com.liquidnet.service.platform.service.ticketSystem;
 
-import com.liquidnet.service.platform.param.ticketSystem.STFieldListParam;
-import com.liquidnet.service.platform.param.ticketSystem.STInsertFieldParam;
-import com.liquidnet.service.platform.param.ticketSystem.STInsertPerformanceParam;
+import com.liquidnet.service.platform.param.ticketSystem.*;
 import com.liquidnet.service.platform.vo.ticketSystem.*;
 
 import java.time.LocalDateTime;
@@ -44,7 +42,7 @@ public interface ITicketSystemService {
     /**
      * 新增演出场厅
      *
-     * @param accessToken       访问令牌
+     * @param accessToken 访问令牌
      */
     STFieldChangeVo insertField(String accessToken, STInsertFieldParam insertFieldParam);
 
@@ -52,7 +50,7 @@ public interface ITicketSystemService {
     /**
      * 上报演出场次接口
      *
-     * @param accessToken     访问令牌
+     * @param accessToken 访问令牌
      * @return {
      * "sessionId1":"sessionCode1",
      * "sessionId2":"sessionCode2"
@@ -64,49 +62,25 @@ public interface ITicketSystemService {
     /**
      * 更新上报的演出项目数据
      *
-     * @param accessToken     访问令牌
-     * @param performanceId   演出ID
-     * @param performanceName 演出名称
-     * @param performanceDesc 演出描述
-     * @param typeId          演出类型
-     * @param posterUrl       演出封面图
-     * @param sponsor         主办方，多个用英文逗号分隔
-     * @param performer       演员，多个用英文逗号分隔
-     * @param approval        批文号
+     * @param accessToken 访问令牌
      */
-    boolean updatePerformance(String accessToken, String performanceId, String performanceName, String performanceDesc, Integer typeId,
-                              String posterUrl, String sponsor, String performer, String approval);
+    boolean updatePerformance(String accessToken, STUpdatePerformanceParam updatePerformanceParam);
 
     /**
      * 更新上报的场次数据
      *
      * @param accessToken      访问令牌
-     * @param sessionId        演出场次ID
-     * @param sessionCode      演出场次编码
-     * @param sessionName      场次名称
-     * @param sessionStartTime 场次开始时间
-     * @param sessionEndTime   场次结束时间
-     * @param hallCode         场厅编码
-     * @param hasSeat          是否有座，0：无座1：有座
-     * @param performanceId    演出ID
-     * @param sessionStatus    场次状态，1 正常，2 取消
-     * @param tag              标记，0:正式，1:测试
-     * @param seatingChart     票图URL
      * @return
      */
-    boolean updateTimes(String accessToken, String sessionId, String sessionCode, String sessionName, LocalDateTime sessionStartTime,
-                        LocalDateTime sessionEndTime, String hallCode, Integer hasSeat, String performanceId, Integer sessionStatus,
-                        Integer tag, String seatingChart);
+    boolean updateTimes(String accessToken, STUpdateTimesParam updateTimesParam);
 
     /**
      * 上报票价信息
      *
      * @param accessToken 访问令牌
-     * @param sessionCode 场次编码
-     * @param priceList   票价信息数组
      * @return
      */
-    boolean insertTicketPrice(String accessToken, String sessionCode, List<TicketPriceVo> priceList);
+    boolean insertTicketPrice(String accessToken,STInsertTicketPriceParam insertTicketPriceParam );
 
     /**
      * 删除票价信息

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/ticketSystem/impl/ITicketSystemServiceImpl.java

@@ -7,9 +7,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.platform.param.ticketSystem.STFieldListParam;
-import com.liquidnet.service.platform.param.ticketSystem.STInsertFieldParam;
-import com.liquidnet.service.platform.param.ticketSystem.STInsertPerformanceParam;
+import com.liquidnet.service.platform.param.ticketSystem.*;
 import com.liquidnet.service.platform.service.ticketSystem.ITicketSystemService;
 import com.liquidnet.service.platform.vo.ticketSystem.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,19 +134,19 @@ public class ITicketSystemServiceImpl implements ITicketSystemService {
     }
 
     @Override
-    public boolean updatePerformance(String accessToken, String performanceId, String performanceName, String performanceDesc, Integer typeId, String posterUrl, String sponsor, String performer, String approval) {
+    public boolean updatePerformance(String accessToken, STUpdatePerformanceParam updatePerformanceParam) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
         MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
         params.add("accessToken", accessToken);
-        params.add("performanceId", performanceId);
-        params.add("performanceName", performanceName);
-        params.add("approval", approval);
-        params.add("typeId", typeId.toString());
-        params.add("posterUrl", posterUrl);
-        params.add("performanceDesc", performanceDesc);
-        params.add("sponsor", sponsor);
-        params.add("performer", performer);
+        params.add("performanceId", updatePerformanceParam.getPerformanceId());
+        params.add("performanceName", updatePerformanceParam.getPerformanceName());
+        params.add("approval", updatePerformanceParam.getApproval());
+        params.add("typeId", updatePerformanceParam.getTypeId().toString());
+        params.add("posterUrl", updatePerformanceParam.getPosterUrl());
+        params.add("performanceDesc", updatePerformanceParam.getPerformanceDesc());
+        params.add("sponsor", updatePerformanceParam.getSponsor());
+        params.add("performer", updatePerformanceParam.getPerformer());
         ResponseDataVo<Boolean> response =
                 JsonUtils.fromJson(HttpUtil.postRaw(ticketSystemUrl + "/report/performance/update", JSON.toJSONString(params), headers),
                         new TypeReference<ResponseDataVo<Boolean>>() {
@@ -157,24 +155,22 @@ public class ITicketSystemServiceImpl implements ITicketSystemService {
     }
 
     @Override
-    public boolean updateTimes(String accessToken, String sessionId, String sessionCode, String sessionName, LocalDateTime sessionStartTime,
-                               LocalDateTime sessionEndTime, String hallCode, Integer hasSeat, String performanceId, Integer sessionStatus,
-                               Integer tag, String seatingChart) {
+    public boolean updateTimes(String accessToken,  STUpdateTimesParam updateTimesParam) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
         MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
         params.add("accessToken", accessToken);
-        params.add("sessionId", sessionId);
-        params.add("sessionCode", sessionCode);
-        params.add("sessionName", sessionName);
-        params.add("sessionStartTime", DateUtil.Formatter.yyyyMMddHHmmss.format(sessionStartTime));
-        params.add("sessionEndTime", DateUtil.Formatter.yyyyMMddHHmmss.format(sessionEndTime));
-        params.add("hallCode", hallCode);
-        params.add("hasSeat", hasSeat.toString());
-        params.add("performanceId", performanceId);
-        params.add("sessionStatus", sessionStatus.toString());
-        params.add("tag", tag.toString());
-        params.add("seatingChart", seatingChart);
+        params.add("sessionId", updateTimesParam.getSessionId());
+        params.add("sessionCode", updateTimesParam.getSessionCode());
+        params.add("sessionName", updateTimesParam.getSessionName());
+        params.add("sessionStartTime", DateUtil.Formatter.yyyyMMddHHmmss.format(updateTimesParam.getSessionStartTime()));
+        params.add("sessionEndTime", DateUtil.Formatter.yyyyMMddHHmmss.format(updateTimesParam.getSessionEndTime()));
+        params.add("hallCode", updateTimesParam.getHallCode());
+        params.add("hasSeat", updateTimesParam.getHasSeat().toString());
+        params.add("performanceId", updateTimesParam.getPerformanceId());
+        params.add("sessionStatus", updateTimesParam.getSessionStatus().toString());
+        params.add("tag", updateTimesParam.getTag().toString());
+        params.add("seatingChart", updateTimesParam.getSeatingChart());
         ResponseDataVo<Boolean> response =
                 JsonUtils.fromJson(HttpUtil.postRaw(ticketSystemUrl + "/report/session/update", JSON.toJSONString(params), headers),
                         new TypeReference<ResponseDataVo<Boolean>>() {
@@ -183,13 +179,13 @@ public class ITicketSystemServiceImpl implements ITicketSystemService {
     }
 
     @Override
-    public boolean insertTicketPrice(String accessToken, String sessionCode, List<TicketPriceVo> priceList) {
+    public boolean insertTicketPrice(String accessToken,STInsertTicketPriceParam insertTicketPriceParam) {
         MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
         headers.add("Accept", "application/json;charset=UTF-8");
         MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
         params.add("accessToken", accessToken);
-        params.add("sessionId", sessionCode);
-        params.add("priceList", JSON.toJSONString(priceList));
+        params.add("sessionCode", insertTicketPriceParam.getSessionCode());
+        params.add("priceList", JSON.toJSONString(insertTicketPriceParam.getPriceList()));
         ResponseDataVo<Boolean> response =
                 JsonUtils.fromJson(HttpUtil.postRaw(ticketSystemUrl + "/report/inventory", JSON.toJSONString(params), headers),
                         new TypeReference<ResponseDataVo<Boolean>>() {