核销debug调整

src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java

@@ -303,7 +303,7 @@ public class AsyncFactory {
                 try {
                     AuthContextUtils.setTenant("001");
                     Thread.sleep(20*1000);
-                    log.debug("saveVtbSubmit");
+                    log.debug("saveVtbSubmit---verificationId:{} totalAmount:{} state:{} realaseFlag:{}",verificationId,totalAmount,state,realaseFlag);
                     VtbVerificationService vtbVerificationService = SpringUtils.getBean(VtbVerificationService.class);
                     VtbVerification verification = vtbVerificationService.getById(verificationId);
                     if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -282,7 +282,14 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         boolean isBackCommit = affairCommit.getState()==2;
         if(result.getStatus()==200){
             // 判断是否含有下个节点
-            String flag = result.getData();
+            //String flag = result.getData();
+            //取消异步防止导致各种异常
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            String flag = checkAffairSummery(affairCommit.getTargetId());
             //保存记录
             try {
                 // 判断是否含有下个节点

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -33,6 +33,7 @@ import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
 import com.qs.serve.modules.vtb.entity.VtbVerificationYard;
 import com.qs.serve.modules.vtb.entity.VtbVerificationYardItem;
+import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl;
 import com.qs.serve.task.TbsTask;
 import lombok.AllArgsConstructor;
 import org.jetbrains.annotations.NotNull;
@@ -89,29 +90,22 @@ public class VtbVerificationApplication {
                     }
                 }
             }
-//            List<TbsActivitySubject> activitySubjects = activitySubjectService.listByActivityId(verification.getActivityId());
-//            for (TbsActivitySubject activitySubject : activitySubjects) {
-//                for (TbsAffairCommitBo.AffairSubjectLine subjectLine : affairCommit.getAffairSubjectLines()) {
-//                    if(subjectLine.getSubjectId()==null||subjectLine.getAmount()==null){
-//                        return R.error("AffairSubjectLines参数错误");
-//                    }
-//                    if(subjectLine.getSubjectId().equals(activitySubject.getSubjectId())){
-//                        BigDecimal used = activitySubject.getUsedAmount()==null?BigDecimal.ZERO:activitySubject.getUsedAmount();
-//                        BigDecimal diff = activitySubject.getAmount().subtract(used);
-//                        if(subjectLine.getAmount().compareTo(diff)>=0){
-//                            return R.error("科目["+activitySubject.getSubjectName()+"]余额为："+ diff);
-//                        }
-//                    }
-//                }
-//            }
         }
 
         boolean isBackCommit = affairCommit.getState()==2;
         R<String> result = seeYonService.commonCommit(affairCommit, TbsSeeYonConst.CostCheckConf.Code(),verification.getSyFormId());
         if(result.getStatus()==200){
             // 判断是否含有下个节点
-            String flag = result.getData();
+            //String flag = result.getData();
-            R r = commitAffairSuccess(affairCommit, verification, isBackCommit, flag);
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class);
+            String summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString());
+
+            R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult);
             try {
                 //解决同步冻结时有过期的活动
                 TbsTask tbsTask = SpringUtils.getBean(TbsTask.class);
@@ -284,10 +278,6 @@ public class VtbVerificationApplication {
                 vtbVerificationService.updateById(vtbVer);
             }
         }
-        if(isNext){
-            //判断是否直接跳过审批的申请
-            AsyncManager.me().execute(AsyncFactory.saveVtbSubmit(verification.getId(), totalAmount,affairCommit.getState(),isRelease));
-        }
         return R.ok();
     }