Merge branch 'refs/heads/v20.9_settlement_20240805' into test

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

@@ -3,6 +3,7 @@ package com.clx.performance.controller.temp;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.listener.OrderChildSyncTransportListener;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.vo.mq.SettlementStatisticsMqParam;
@@ -33,6 +34,8 @@ public class TempSettlementController {
     private OrderChildSyncTransportListener orderChildSyncTransportListener;
     @Autowired
     private SettlementMqHandlerService settlementMqHandlerService;
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
 
     @ApiOperation(value = "settlementStatistics", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/settlementStatistics", method = RequestMethod.GET)
@@ -48,10 +51,18 @@ public class TempSettlementController {
     @ApiOperation(value = "运单同步broker", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/orderChildSync", method = RequestMethod.GET)
     public Result orderChildSync(String childNo) {
-        OrderChild orderChild = orderChildDao.getByChildNo(childNo).get();
 
-        // 同步broker
-        orderChildSyncTransportListener.transportOrderChildProcess(orderChild);
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildSync(childNo);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "运单更新broker", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderChildUpdate", method = RequestMethod.GET)
+    public Result orderChildUpdate(String childNo) {
+
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(childNo);
 
         return Result.ok();
     }

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

@@ -28,10 +28,10 @@ public class BrokerServiceImpl implements BrokerService {
         Result<Object> result = brokerFeign.saveTransport(param);
         log.info("运单同步网络货运, param:{}", JSON.toJSONString(param));
         if (result.getCode() != 0) {
-            log.info("运单同步网络货运失败, msg:{}", result.getMsg());
+            log.info("运单同步网络货运失败, childNo:{}, msg:{}", param.getOrderChild().getSourceChildNo(), result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());
         }
-        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
+        log.info("运单同步网络货运, childNo:{}, result:{}", param.getOrderChild().getSourceChildNo(), JSON.toJSONString(result));
     }
 
     @Override
@@ -40,10 +40,10 @@ public class BrokerServiceImpl implements BrokerService {
 
         Result<Object> result = brokerFeign.modifyTransport(param);
         if (result.getCode() != 0) {
-            log.info("运单更新网络货运失败, msg:{}", result.getMsg());
+            log.info("运单更新网络货运失败, childNo:{}, msg:{}", param.getOrderChild().getSourceChildNo(), result.getMsg());
             throw new ServiceSystemException(ResultEnum.FEIGN_ERROR, result.getMsg());
         }
-        log.info("运单更新网络货运, result:{}", JSON.toJSONString(result));
+        log.info("运单更新网络货运, childNo:{}, result:{}", param.getOrderChild().getSourceChildNo(), JSON.toJSONString(result));
     }
 
     @Override
@@ -57,9 +57,9 @@ public class BrokerServiceImpl implements BrokerService {
 
         Result<TransportVO> result = brokerFeign.getTransportByChildNo(childNo, settlementConfig.getBrokerUserCode(), settlementNo);
         if (result.getCode() != 0) {
-            log.info("运单同步网络货运失败, msg:{}", result.getMsg());
+            log.info("获取网络货运运单状态, childNo:{}, msg:{}", childNo, result.getMsg());
         }
-        log.info("运单同步网络货运, result:{}", JSON.toJSONString(result));
+        log.info("获取网络货运运单状态, childNo:{}, result:{}", childNo, JSON.toJSONString(result));
 
         return result.getData();
     }

performance-web/src/main/java/com/clx/performance/listener/broker/BrokerDelayListener.java

@@ -28,7 +28,7 @@ public class BrokerDelayListener {
     @RabbitListener(queues = RabbitKeyBrokerConstants.DEFAULT_DEAD_QUEUE)
     public void process(Message message) {
         try{
-            log.info("无车承运-延迟, message:{}", message);
+            log.info("无车承运-延迟, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<MqDelay>>(){}).getData());
         }catch (Exception e){
             log.info("无车承运-延迟 失败",e);

performance-web/src/main/java/com/clx/performance/listener/settle/SettlementDelayListener.java

@@ -28,7 +28,7 @@ public class SettlementDelayListener {
     @RabbitListener(queues = RabbitKeySettlementConstants.DEFAULT_DEAD_QUEUE)
     public void process(Message message) {
         try{
-            log.info("结算-延迟, message:{}", message);
+            log.info("结算-延迟, message:{}", new String(message.getBody()));
             process(JSON.parseObject(new String(message.getBody()), new TypeReference<MqWrapper<MqDelay>>(){}).getData());
         }catch (Exception e){
             log.info("结算-延迟 失败",e);