Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into…

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.performance.component.ThirdComponent;
 import com.clx.performance.extranal.transport.TransportService;
-import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 
@@ -34,6 +34,8 @@ public class TempController {
     private FeignOrderChildService carrierOrderChildService;
     @Autowired
     private TransportService transportService;
+    @Autowired
+    private TransportFeignService transportFeignService;
 
 
 
@@ -75,14 +77,24 @@ public class TempController {
     }
 
 
-    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
-    public Result<Void> orderChildSync() {
-        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
-        param.setChildNo("123");
+//    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
+//    @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
+//    public Result<Void> orderChildSync(@RequestBody ThirdOrderChildBrokerParam param1) {
+//        ThirdOrderChildBrokerParam param = new ThirdOrderChildBrokerParam();
+//        param.setChildNo("123");
+//
+//        transportService.orderChildSync(param);
+//
+//        return Result.ok();
+//    }
 
-        transportService.orderChildSync(param);
+    @ApiOperation(value = "承运同步网络货运 (临时接口)", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderChildPaySync", method = RequestMethod.POST)
+    public Result<Void> orderChildPaySync(@RequestBody OrderChildPaySyncParam param) {
 
+        HttpDTO httpDTO = transportFeignService.orderChildPaySync(param);
+        String decrypt = ThirdComponent.decrypt(httpDTO.getData());
+        log.info("{}", decrypt);
         return Result.ok();
     }