Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

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

@@ -66,6 +66,7 @@ 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);
 
+        String settlementNo = null ;
         SettlementOwner settlementOwner = null;
 
         OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(settlementOwnerDetail.getOwnerUserNo());
@@ -74,27 +75,29 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             LocalDateTime settlementPeriodTime = LocalDateTimeUtils.getBeginMonthDate();
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodMonth(settlementOwnerDetail.getOrderNo(), settlementPeriodTime, settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 月结初始化
-                settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime);
+                settlementNo = settlementPeriodMonthInit(settlementOwnerDetail, settlementPeriodTime);
             }
             else {  // 月结更新
                 settlementPeriodMonthUpdate(settlementOwner, settlementOwnerDetail);
+                settlementNo = settlementOwner.getSettlementNo();
             }
         }
         else {
             settlementOwner = settlementOwnerDao.selectUnlockOfSettlementPeriodImmediate(settlementOwnerDetail.getOrderNo(), settlementOwnerDetail.getInvoiceType()).orNull();
             if (settlementOwner == null){   // 拉运完成初始化
-                settlementPeriodImmediateInit(settlementOwnerDetail);
+                settlementNo = settlementPeriodImmediateInit(settlementOwnerDetail);
             }
             else {  // 拉运完成更新
                 settlementPeriodImmediateUpdate(settlementOwner, settlementOwnerDetail);
+                settlementNo = settlementOwner.getSettlementNo();
             }
         }
 
-        settlementDriverSave(settlementDriverDetail,settlementOwner.getSettlementNo());
+        settlementDriverSave(settlementDriverDetail,settlementNo);
 
         // 更新结算单
-        settlementOwnerDetail.setSettlementNo(settlementOwner.getSettlementNo());
-        settlementDriverDetail.setSettlementNo(settlementOwner.getSettlementNo());
+        settlementOwnerDetail.setSettlementNo(settlementNo);
+        settlementDriverDetail.setSettlementNo(settlementNo);
         settlementOwnerDetailDao.updateSettlementNo(settlementOwnerDetail);
         settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
     }
@@ -139,7 +142,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 月结初始化
      */
-    private void settlementPeriodMonthInit(SettlementOwnerDetail settlementOwnerDetail, LocalDateTime settlementPeriodTime){
+    private String settlementPeriodMonthInit(SettlementOwnerDetail settlementOwnerDetail, LocalDateTime settlementPeriodTime){
 
 
         //获取所有detail
@@ -174,6 +177,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementLogService.saveSettlementLog(settlementNo,
                 SettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),SettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),0L,"系统");
+
+        return settlementNo;
     }
 
     /**
@@ -215,7 +220,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 拉运完成结 初始化
      */
-    private void settlementPeriodImmediateInit(SettlementOwnerDetail settlementOwnerDetail){
+    private String settlementPeriodImmediateInit(SettlementOwnerDetail settlementOwnerDetail){
         SettlementOwner settlementOwner = new SettlementOwner();
 
         String settlementNo = settlementNoGenerate();
@@ -245,6 +250,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementLogService.saveSettlementLog(settlementNo,
                 SettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),SettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),0L,"系统");
+
+        return settlementNo;
     }
 
     /**