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/SettlementOwnerServiceImpl.java

@@ -346,20 +346,25 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     @Override
     public void saveExpress(SaveExpressParam param){
         String settlementNo = param.getSettlementNo();
+        SettlementOwner settlementOwner = settlementOwnerDao.selectBySettlementNo(settlementNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
         settlementOwnerDao.saveExpress(settlementNo,param.getExpressCompany(),param.getExpressNo());
 
         settlementOwnerDao.updateStatusBySettlementNo(settlementNo
                 ,SettlementOwnerEnum.Status.COMPLETED.getCode());
 
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-        //保存结算单日志----邮寄发票
-        settlementLogService.saveSettlementLog(settlementNo,
-                SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getCode(),SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getMsg(),
-                OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
-        //保存结算单日志----已完结
-        settlementLogService.saveSettlementLog(settlementNo,
-                SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
-                OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+        if(!Objects.equals(settlementOwner.getStatus(),SettlementOwnerEnum.Status.COMPLETED.getCode())){
+            UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+            //保存结算单日志----邮寄发票
+            settlementLogService.saveSettlementLog(settlementNo,
+                    SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getCode(),SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getMsg(),
+                    OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+            //保存结算单日志----已完结
+            settlementLogService.saveSettlementLog(settlementNo,
+                    SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
+                    OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+        }
+
     }
 
     @Override
@@ -405,7 +410,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志
         settlementLogService.saveSettlementLog(settlementNo,
-                SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getCode(),SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getMsg(),
+                SettlementLogEnum.Type.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode(),SettlementLogEnum.Type.PLATFORM_CONFIRMED_OWNER_PAYMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
 
         if(Objects.equals(settlementOwner.getInvoiceStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单