Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-api/src/main/java/com/clx/performance/feign/BrokerFeign.java

@@ -3,7 +3,6 @@ package com.clx.performance.feign;
 import com.clx.performance.vo.pc.broker.TransportParam;
 import com.clx.performance.vo.pc.broker.TransportVO;
 import com.msl.common.result.Result;
-import feign.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,7 +19,7 @@ public interface BrokerFeign {
      * 运单同步
      */
     @RequestMapping(method = RequestMethod.POST, value = "/broker-service/open/transport/saveTransport")
-    Result<String> saveTransport(@RequestBody TransportParam param);
+    Result<Object> saveTransport(@RequestBody TransportParam param);
 
     @RequestMapping(value = "/broker-service/open/transport/getTransportByChildNo", method = RequestMethod.GET)
     Result<TransportVO> getTransportByChildNo(@RequestParam @NotBlank(message = "运单编号不能为空") String childNo,

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -25,8 +25,8 @@ public class BrokerServiceImpl implements BrokerService {
 
         param.setUserCode(settlementConfig.getBrokerUserCode());
 
+        Result<Object> result = brokerFeign.saveTransport(param);
         log.info("运单同步网络货运, param:{}", JSON.toJSONString(param));
-        Result<String> result = brokerFeign.saveTransport(param);
         if (result.getCode() != 0) {
             log.info("运单同步网络货运失败, msg:{}", result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());