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

performance-web/src/main/java/com/clx/performance/controller/pc/OrderCancelController.java

@@ -26,6 +26,7 @@ import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.base.PageParam;
 import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -103,7 +104,7 @@ public class OrderCancelController {
 
     @ApiOperation(value = "syncTest", notes = "<br>By:胡宇帆")
     @GetMapping("/syncTest")
-    public Result<String> syncTest(@RequestParam String childNo) {
+    public Result<HttpDTO> syncTest(@RequestParam String childNo) {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -111,8 +112,8 @@ public class OrderCancelController {
 
         ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
         log.info("=======================生成Param{}", JSONUtil.parse(param));
-        String result = transportFeignService.orderChildSync(param);
-        return Result.ok(result);
+        Result<HttpDTO> httpDTOResult = transportFeignService.orderChildSync(param);
+        return httpDTOResult;
     }
 
 

performance-web/src/main/java/com/clx/performance/feign/TransportFeignService.java

@@ -4,6 +4,7 @@ import com.clx.performance.param.feign.transport.OwnerLegalSyncParam;
 import com.clx.performance.param.feign.transport.OwnerPersonalSyncParam;
 import com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam;
 import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -22,7 +23,7 @@ public interface TransportFeignService {
      * 运单同步
      */
     @RequestMapping(value = "/transport-service/thirdParty/order/orderChildSync", method = RequestMethod.POST)
-    String orderChildSync(@RequestBody ThirdOrderChildBrokerParam param);
+    Result<HttpDTO> orderChildSync(@RequestBody ThirdOrderChildBrokerParam param);
 
     /**
      * 运单支付运费同步

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -16,6 +16,7 @@ import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementService;
 import com.clx.performance.vo.feign.transport.ThirdOrderChildBrokerResultVO;
+import com.msl.common.dto.HttpDTO;
 import com.msl.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,8 +71,8 @@ public class SettlementServiceImpl implements SettlementService {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
             //是否通过风控,调用网络货运
             ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
-            String result = transportFeignService.orderChildSync(param);
-            System.out.println(result);
+            Result<HttpDTO> httpDTOResult = transportFeignService.orderChildSync(param);
+            System.out.println(httpDTOResult);
             if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
                 settlementDriverDetail.setPrepayFreightFlag(1);
             }