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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/KylinStationUploadParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "KylinStationUploadParam", description = "上载入参")
+@Data
+public class KylinStationUploadParam implements Serializable {
+    private static final long serialVersionUID = -44725043769303036L;
+    @ApiModelProperty(position = 10, value = "票明细数据")
+    List<KylinStationCheckOrderParam> checkOrderParamList;
+}

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
+import com.liquidnet.service.kylin.dto.param.KylinStationUploadParam;
 import com.liquidnet.service.kylin.dto.vo.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;
 import com.liquidnet.service.kylin.utils.DataUtils;
@@ -327,9 +328,10 @@ public class KylinStationController {
 
     @ApiOperation(value = "上载验票数据")
     @PostMapping("upload")
-    public ResponseDto<Object> uploadTicketData(@RequestBody List<KylinStationCheckOrderParam> checkOrderParamList) {
-        log.debug("checkDataParams:{}", JsonUtils.toJson(checkOrderParamList));
+    public ResponseDto<Object> uploadTicketData(@RequestBody KylinStationUploadParam parameter) {
+        log.debug("checkDataParams:{}", JsonUtils.toJson(parameter));
 
+        List<KylinStationCheckOrderParam> checkOrderParamList = parameter.getCheckOrderParamList();
         if (!CollectionUtils.isEmpty(checkOrderParamList)) {
             kylinOrderTicketEntitiesService.updateByStation(checkOrderParamList);
         }