承运优化需求9.25-车主结算

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

@@ -169,20 +169,17 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
                 .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
-                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         // 拆单
         if (Objects.equals(mq.getType(), SettlementStatisticsMqParam.Type.SEPARATE.getCode())){
-            settlementStatisticsSeparate(settlementOwnerDetail, settlementDriverDetail);
+            settlementStatisticsSeparate(settlementOwnerDetail);
 
             // 发送mq (运单更新)
-            orderChildBrokerMqService.orderChildUpdate(settlementDriverDetail.getChildNo());
+            orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
 
             return;
         }
 
-        log.info("当前车主计费信息{},司机计费信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         if (settlementOwnerDetail.getInvoiceFreight() == null) {
             log.info("当前车主计费信息开票金额为空,需要重新处理计算开票金额");
             settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
@@ -243,35 +240,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
         }
 
-        //车主结算单自动支付
-        log.info(" 运单号 {}, 是否是普通单 {} ",settlementDriverDetail.getChildNo(),settlementDriverDetail.getInvoiceType());
-        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
-            paySettlementDriver(settlementDriverDetail);
-        } else {
-            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
-                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
-                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
-            && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-
-        }
-
         // 更新结算单
         settlementOwnerDetail.setSettlementNo(settlementNo);
-        settlementDriverDetail.setSettlementNo(settlementNo);
         settlementOwnerDetailDao.updateSettlementNo(settlementOwnerDetail);
-        settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
 
         // 发送mq (运单更新)
-        orderChildBrokerMqService.orderChildUpdate(settlementDriverDetail.getChildNo());
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
 
     }
 
@@ -279,6 +253,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Transactional(rollbackFor = Exception.class)
     public void settlementDriverSettlement(SettlementDriverSettleMqParam mq) {
 
+        OrderChild orderChild = orderChildDao
+                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        OrderGoods orderGoods = orderGoodsDao
+                .getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -320,6 +299,27 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriver.setPlatformServiceFee(settlementDriverDetail.getPlatformServiceFee());
 
         settlementDriverDao.saveEntity(settlementDriver);
+
+        //车主结算单自动支付
+        log.info(" 运单号 {}, 是否是普通单 {} ",settlementDriverDetail.getChildNo(),settlementDriverDetail.getInvoiceType());
+        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
+            paySettlementDriver(settlementDriverDetail);
+        } else {
+            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
+                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
+                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+                settlementDriverDetail.setSettlementNo(settlementNo);
+                //插入同步网络货运待支付记录
+                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
+            }
+            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
+                    && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+                settlementDriverDetail.setSettlementNo(settlementNo);
+                //插入同步网络货运待支付记录
+                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
+            }
+
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -915,7 +915,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 月结更新
      */
-    private void settlementStatisticsSeparate(SettlementOwnerDetail settlementOwnerDetail, SettlementDriverDetail settlementDriverDetail){
+    private void settlementStatisticsSeparate(SettlementOwnerDetail settlementOwnerDetail){
         String settlementNo = settlementOwnerDetail.getSettlementNo();
         SettlementOwner settlementOwner = settlementOwnerDao
                 .findBySettlementNo(settlementNo).orElseThrow(ResultEnum.DATA_NOT_FIND);
@@ -957,10 +957,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         settlementOwnerDetail.setSettlementNo(null);
         settlementOwnerDetail.setSeparateRemark("系统自动拆单（原结算单号"+settlementNo+"）");
-        settlementDriverDetail.setSettlementNo(null);
 
         settlementOwnerDetailDao.updateClearSettlementNo(settlementOwnerDetail);
-        settlementDriverDetailDao.updateClearSettlementNo(settlementDriverDetail);
     }
 
     /**