Merge branch 'v1.0_init_contract_20240306' into test

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

 package com.clx.performance.feign;
 
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
+import com.clx.open.sdk.request.action.GetOwnerAccountInfoAction;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
@@ -33,4 +34,7 @@ public interface PerformanceSDKFeign {
     @PostMapping("clx-performance/feign/sdk/getOwnerRuleFile")
     Result<BreakContractOwnerRuleFileVO> getOwnerRuleFile(@RequestBody GetOrderBreakContractOwnerRuleFileAction action);
 
+    @GetMapping(value = {"clx-performance/feign/sdk/getOwnerAccountInfo"})
+    Result<OwnerAccountAllVO> getOwnerAccountInfo(@RequestBody GetOwnerAccountInfoAction action);
+
 }

performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java

 package com.clx.performance.controller.feign;
 
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
+import com.clx.open.sdk.request.action.GetOwnerAccountInfoAction;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
@@ -67,5 +68,10 @@ public class PerformanceSdkFeignController {
         return Result.ok(breakContractOwnerRuleService.getRuleFile(action.getId()));
     }
 
+    @ApiOperation(value = "查询用户预付运费和保证金账户", notes = "<br>By:艾庆国")
+    @GetMapping("/getOwnerAccountInfo")
+    public Result<OwnerAccountAllVO> getOwnerAccountInfo(@RequestBody GetOwnerAccountInfoAction action) {
+        return Result.ok(ownerAccountService.accountInfo(action.getUserNo()));
+    }
 
 }

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

 package com.clx.performance.listener;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.clx.open.sdk.callback.OpenCallBackClient;
+import com.clx.open.sdk.callback.message.OrderChildLastOneMessage;
 import com.clx.open.sdk.callback.message.OrderChildMessage;
 import com.clx.open.sdk.callback.message.OrderChildSyncMessage;
 import com.clx.open.sdk.enums.ResultStatusEnum;
@@ -116,7 +118,32 @@ public class OrderChildDtsListener  {
             Result<?> result = openCallBackClient.encryptPost(data,after.topic());
             log.info("运单信息同步，运单编号:{},响应结果:{}",after.getChildNo(),JSON.toJSONString(result));
             syncLastTruck(orderInfoFeign,after);
+            return;
+        }
 
+        if (Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())) {
+            if(Objects.equals(com.clx.open.sdk.enums.OrderChildEnum.Status.COMMON_CANCEL.getCode(),after.getStatus()) ||
+                    (after.getStatus() >= OrderChildEnum.Status.ARRIVE_RECEIVE.getCode()  && after.getStatus() <= OrderChildEnum.Status.COMPLETE.getCode())){
+                OrderChild child;
+                if(Objects.equals(orderInfoFeign.getOrderStatus(), OrderEnum.Status.COMPLETED.getCode()) ||
+                        Objects.equals(orderInfoFeign.getOrderStatus(), OrderEnum.Status.SUCCESS.getCode())) { //订单变成已完成 || 已完结
+                    OrderEnum.Status byCode = OrderEnum.Status.getByCode(orderInfoFeign.getOrderStatus());
+                    log.info("订单号:{},运单号：{},订单状态：{},开始查询最后一车运单===========" ,orderInfoFeign.getOrderNo(),after.getChildNo(),
+                            Objects.nonNull(byCode)?byCode.getName():"未知状态");
+                    child = lastTruckService.getOrderCompleteLastTruck(after.getOrderNo());
+                }else{  // 订单除  已完成 || 已完结  外的其他状态
+                    child = lastTruckService.getLastTruckChild(after.getOrderNo());
+                }
+                if (Objects.nonNull(child)) {
+                    log.info("开始同步新货主客户端最后一车的运单，运单编号:{}", child.getChildNo());
+                    OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode().toString());
+                    OrderChildLastOneMessage message = new OrderChildLastOneMessage();
+                    message.setChildNo(child.getChildNo());
+                    Result<?> result = openCallBackClient.encryptPost(JSONUtil.parse(message).toString(), message.topic());
+                    log.info("结束同步新货主客户端最后一车的运单，运单编号:{}，响应结果:{}", child.getChildNo(), JSONUtil.parse(result));
+                }
+
+            }
         }
     }
 
@@ -137,6 +164,7 @@ public class OrderChildDtsListener  {
             if(Objects.nonNull(child)){
                 lastTruckService.syncLastTruckChild(child);
             }
+
         }
     }