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

@@ -200,25 +200,24 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
         }
-        Integer status = SettlementOwnerEnum.Status.INVOICE_TO_BE_MAILED.getCode();//待邮寄发票  结算流程状态
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         String settlementNo = settlementOwner.getSettlementNo();
+
+        //更新状态
+        settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.COMPLETED.getCode());
+
         //保存结算单日志
         settlementLogService.saveSettlementLog(settlementNo,
                 SettlementLogEnum.Type.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode(),SettlementLogEnum.Type.OWNER_CONFIRMED_PLATFORM_PAYMENT.getMsg(),
                 OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
 
-        if(Objects.equals(settlementOwner.getInvoiceStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单
-            status = SettlementOwnerEnum.Status.COMPLETED.getCode();
-            //保存结算单日志
-            settlementLogService.saveSettlementLog(settlementNo,
-                    SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
-                    OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
-        }
+        //保存结算单日志
+        settlementLogService.saveSettlementLog(settlementNo,
+                SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
+                OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+
 
-        //更新状态
-        settlementOwnerDao.updateStatusBySettlementNo(settlementNo,status);
     }
 
     @Override
@@ -386,7 +385,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 param.getPaymentAmount());
 
         settlementOwnerDao.updateStatusBySettlementNo(settlementNo
-                ,SettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode());
+                ,SettlementOwnerEnum.Status.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode());
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----平台付款
         settlementLogService.saveSettlementLog(settlementNo,