Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102' into test

performance-web/src/main/java/com/clx/performance/job/OrderChildSyncTransportInvoiceExceptionJob.java

@@ -7,11 +7,19 @@ import cn.hutool.json.JSONUtil;
 import com.clx.performance.component.ThirdComponent;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderChildSyncTransportInvoiceRecordDao;
+import com.clx.performance.dao.settle.SettlementDriverDetailDao;
+import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dto.OrderChildSyncDTO;
+import com.clx.performance.dto.OrderChildSyncResultDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.TransportSyncTypeEnum;
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.listener.OrderChildSyncTransportListener;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderChildSyncTransportInvoiceRecord;
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam;
 import com.msl.common.result.Result;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -36,6 +44,9 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
 
     private final TransportFeignService transportFeignService;
 
+    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+
+    private final SettlementDriverDetailDao settlementDriverDetailDao;
     /**
      * 同步网络货运
      */
@@ -52,16 +63,31 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
         for (OrderChildSyncTransportInvoiceRecord record : recordList) {
             String data = transportFeignService.getRiskStatus(ThirdOrderChildRiskStatusParam.builder().childNo(record.getChildNo()).build()).getData();
             String decrypt = ThirdComponent.decrypt(data);
-            Result bean = JSONUtil.toBean(decrypt, Result.class);
-            if (bean.succeed()) {
-                JSON json = JSONUtil.parse(bean.getData());
+            Result result = JSONUtil.toBean(decrypt, Result.class);
+            if (result.succeed()) {
+                SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+                SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(record.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+                JSON json = JSONUtil.parse(result.getData());
                 Object status = json.getByPath("status");
                 ids.add(record.getId());
+                OrderChildSyncDTO bean = new OrderChildSyncDTO();
+                bean.setCode(0);
+                OrderChildSyncResultDTO dto = new OrderChildSyncResultDTO();
+                OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get();
 
                 if (ObjectUtil.equal(status, 1)) {
-                    OrderChild orderChild = orderChildDao.getByChildNo(record.getChildNo()).get();
-                    orderChildPaySync.transportOrderChildProcess(orderChild);
-                } else {
+                    dto.setStatus(1);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ONLINE.getCode(), settlementDriverDetail);
+                } else if (ObjectUtil.equal(status, 2)){
+                    dto.setStatus(2);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
+
+                }else {
                     Object riskReason = json.getByPath("riskReason");
                     OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
                     entity.setChildNo(json.getByPath("childNo").toString());

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

@@ -98,7 +98,7 @@ public class OrderChildSyncTransportListener {
         extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
     }
 
-    private void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,
+    public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,
                            SettlementOwnerDetail settlementOwnerDetail,
                            Integer invoiceType, SettlementDriverDetail settlementDriverDetail) {
         if (null != bean  && bean.getCode() == 0) {