From f9abfc3893ff445f0a47da9a65cd82b44cd47d44 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 29 Nov 2023 14:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=B8=E9=94=80=EF=BC=88=E5=AE=A1=E6=89=B9=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=9B=9E=E8=B0=83=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VtbVerificationServiceImpl.java      | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index 872bea7d..084d2b78 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -1170,14 +1170,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         boolean isCenterCommit = subjectCenterList.size()>0;
         //0元核销只改变状态
         if(checkZero){
-            //自定义成本中心提交后，无法再自动分配刷新金额
-            if(isCenterCommit){
-                //TODO 刷洗自定义金额
-
-            }else {
-                //自动分配刷新金额
-                fundFlowService.flushActivityAmount(verification.getActivityId());
-            }
+            //自动分配刷新金额（旧流程按比例分配，新流程按比例分配后，进行再分配）
+            fundFlowService.flushActivityAmount(verification.getActivityId());
             verification = new VtbVerification();
             verification.setId(verificationId);
             verification.setVerificationState(VtbVerificationState.Finished.getCode());
@@ -1296,7 +1290,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
 
 
         fundFlowService.saveBatch(addFundFlowList);
-        //更新已用费用记录，并更新活动状态是否完成
+        //更新已用费用记录，并更新活动状态是否完成（旧流程按比例分配，新流程按比例分配后，进行再分配）
         fundFlowService.flushActivityAmount(verification.getActivityId());
         //fundFlow绑定考核期项，用于合计预算使用情况
         LambdaQueryWrapper<VtbVerificationSubject> subjectLqw = new LambdaQueryWrapper<>();
@@ -1304,7 +1298,20 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         VtbVerificationSubject subjectParam = new VtbVerificationSubject();
         subjectParam.setEffectiveFlag(1);
         verificationSubjectService.update(subjectParam,subjectLqw);
-        //TODO 更新成本中心维度
+        //更新成本中心维度
+        if(isCenterCommit){
+            LambdaQueryWrapper<VtbVerificationSubjectCenter> subjectCenterLqw = new LambdaQueryWrapper<>();
+            subjectCenterLqw.eq(VtbVerificationSubjectCenter::getVerificationId,verificationId);
+            VtbVerificationSubjectCenter centerUpdParam = new VtbVerificationSubjectCenter();
+            centerUpdParam.setEffectiveFlag(1);
+            vtbVerificationSubjectCenterService.update(centerUpdParam,subjectCenterLqw);
+            //更新活动状态
+            TbsActivity activityUpdate = new TbsActivity();
+            activityUpdate.setVtbMatchTypeFlag(1);
+            activityUpdate.setId(verification.getActivityId());
+            activityService.updateById(activityUpdate);
+        }
+
 
         BigDecimal totalCostApplyUsed = costApply.getTotalActivityUsedAmount().add(verification.getAmount());
         TbsCostApply updCost = new TbsCostApply();