Merge remote-tracking branch 'origin/v12.8_bug_settlementJob_20240329' into test

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

@@ -3,6 +3,8 @@ package com.clx.performance.job;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.component.ThirdComponent;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.OrderChildSyncTransportRecordDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dto.OrderChildSyncDTO;
@@ -11,13 +13,17 @@ import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.OrderChildSyncTransportRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.feign.transport.OrderChildPaySyncParam;
+import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
+import com.clx.performance.service.settle.SettlementMqService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -45,12 +51,22 @@ public class OrderChildPaySyncTransportJob {
 
     private final SettlementMqHandlerService settlementMqHandlerService;
 
+    private final SettlementDriverDetailService settlementDriverDetailService;
+
+    private final SettlementOwnerDetailService settlementOwnerDetailService;
+
+    private final SettlementMqService settlementMqService;
+
+    private final OrderChildDao orderChildDao;
+
+    private final OrderGoodsDao orderGoodsDao;
+
     /**
      * 同步网络货运
      */
     @XxlJob("orderChildPaySyncTransportJob")
     public void orderChildPaySyncTransportJob() {
-        List<OrderChildSyncTransportRecord> recordList  = orderChildSyncTransportRecordDao.selectListForJob();
+        List<OrderChildSyncTransportRecord> recordList = orderChildSyncTransportRecordDao.selectListForJob();
         if (CollectionUtil.isEmpty(recordList)) {
             return;
         }
@@ -75,16 +91,28 @@ public class OrderChildPaySyncTransportJob {
 
     /**
      * 结算信息job处理
-     * @param childNo
-     */
+     * */
     @XxlJob("settlementDetailInvoiceTypeSyncJob")
-    public void settlementDetailInvoiceTypeSyncJob(String childNo) {
-        log.info("接收参数：{}", childNo);
+    public void settlementDetailInvoiceTypeSyncJob() {
         String jobParam = XxlJobHelper.getJobParam();
         log.info("XxlJobHelper jobParam:{}", jobParam);
-        /*SettlementDetailInvoiceTypeSyncMqParam mqParam = new SettlementDetailInvoiceTypeSyncMqParam();
-        mqParam.setChildNo(childNo);
-        settlementMqHandlerService.settlementDetailInvoiceTypeSync(mqParam);*/
+        SettlementDetailInvoiceTypeSyncMqParam mqParam = new SettlementDetailInvoiceTypeSyncMqParam();
+        mqParam.setChildNo(jobParam);
+        settlementMqHandlerService.settlementDetailInvoiceTypeSync(mqParam);
+    }
+
+
+    @XxlJob("testJob")
+    public void test2() {
+        String jobParam = XxlJobHelper.getJobParam();
+        log.info("XxlJobHelper jobParam:{}", jobParam);
+        OrderChild orderChild = orderChildDao.getByChildNo(jobParam).get();
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
+        Integer settlementDriverDetailId = settlementDriverDetailService.saveSettlementDetail(orderChild);
+        Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods);
+
+        settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
+
     }
 
 }

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

@@ -95,6 +95,7 @@ public class OrderChildSyncTransportListener {
 
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
         ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);

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

@@ -1351,6 +1351,8 @@ public class OrderChildServiceImpl implements OrderChildService {
     }
 
 
+
+
     @Override
     public OrderChildVO getOrderChildInfo(String childNo) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();