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

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -23,6 +23,7 @@ import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
+import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.user.enums.driver.DriverInfoEnum;
@@ -85,6 +86,8 @@ public class OrderCancelComponent implements InitializingBean {
     @Autowired
     private SettlementOwnerDetailDao settlementOwnerDetailDao;
 
+    private final OwnerAccountService ownerAccountService;
+
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
@@ -124,6 +127,8 @@ public class OrderCancelComponent implements InitializingBean {
                     thawAccountParam.setOrderType(OwnerAccountEnum.OrderChildTypeStatus.NETWORK.getCode());
                 }
                 thawAccountParam.setOrderNo(orderNo);
+                log.info("执行解冻账户,参数：{}", JSONUtil.parse(thawAccountParam));
+                ownerAccountService.ownerAccountThaw(thawAccountParam);
                 break;
             case 2: //取消未拉运吨数的货单
                 log.info("2:货主取消未拉运吨数的货单");

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

@@ -67,6 +67,7 @@ public class TransportSyncController {
         String decrypt = ThirdComponent.decrypt(bean.getData());
         log.info("payStatusNotify 解密后：{}", decrypt);
         PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, PayStatusNotifyDTO.class);
+        log.info("支付回调payStatusNotifyDTO:{}", JSONUtil.parse(payStatusNotifyDTO));
         orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
         return ThirdComponent.encrypt(JSON.toJSONString(Result.ok()));
     }