fix: 修复合并核销状态显示

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java

@@ -110,10 +110,7 @@ public class VtbVerificationBatchController {
     @GetMapping("/getById/{id}")
     public R<VtbVerificationBatch> getById(@PathVariable("id") String id){
         VtbVerificationBatch batch = vtbVerificationBatchService.getById(id);
-        if(batch.getVtbBatchStatus().equals(VtbVerificationBatch.BatchState.CHECKING)){
+
-            vtbVerificationBatchOperationService.runCompensate(id);
-            batch = vtbVerificationBatchService.getById(id);
-        }
         List<VtbVerification> verificationList = vtbVerificationService
                 .list(new LambdaQueryWrapper<VtbVerification>()
                 .eq(VtbVerification::getBatchId,batch.getId()));

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -192,7 +192,8 @@ public class VtbVerificationController {
     @PreAuthorize("hasRole('vtb:verification:query')")
     public R<VtbVerification> getById(@PathVariable("id") String id){
         VtbVerification vtbVerification = vtbVerificationService.getById(id);
-        if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
+        boolean notBatch = vtbVerification.getBatchId()==null;
+        if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode()) && notBatch){
             try {
                 vtbVerificationOperationService.runCompensate(id);
                 vtbVerification = vtbVerificationService.getById(id);
@@ -265,7 +266,6 @@ public class VtbVerificationController {
         if(verificationDB.getBatchId()!=null){
             String templateCode = TbsSeeYonConst.BatchCostCheckConf.Code();
             R<List<CtpAffair>> result = seeYonService.commonListAffairs(verificationDB.getBatchId()+"",null,templateCode);
-            //TODO
             List<CtpAffairVo> result2 = verificationApplication.buildCtpAffairVoList(result.getData());
             return R.ok(result2);
         }

src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java

@@ -83,6 +83,9 @@ public class VtbVerification implements Serializable {
     /** 记录释放标识 */
     private Integer regReleaseFlag;
 
+    /** 记录释放人员id */
+    private String regReleaseUserId;
+
     /** 输入的释放标识 */
     private Integer inputReleaseFlag;
 

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

@@ -458,6 +458,8 @@ public class VtbVerificationApplication {
         activity4Upd.setUsedAmount(totalUsed);
         if(totalUsed.compareTo(activity.getTotalAmount())>=0){
             activity4Upd.setActivityState(TbsActivityState.STATE_1_Finished);
+        }else if (activity.getReleaseFlag().equals(1)){
+            activity4Upd.setActivityState(TbsActivityState.STATE_4_Release);
         }else {
             activity4Upd.setActivityState(TbsActivityState.STATE_0_Todo);
         }

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java

@@ -236,7 +236,10 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification
                 VtbVerification vtbVer = new VtbVerification();
                 vtbVer.setId(verification.getId());
                 vtbVer.setRegReleaseFlag(itemCommit.getReleaseFlag());
+                vtbVer.setRegReleaseUserId(AuthContextUtils.getSysUserId());
                 vtbVerificationService.updateById(vtbVer);
+                //完成时会调用更新
+                verification.setRegReleaseFlag(itemCommit.getReleaseFlag());
             }
 
             //保存审批线结果

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -380,35 +380,38 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             Assert.throwEx("当前活动状态不可作废");
         }
 
-        String host = "http://59.37.164.96:2506/action/cms/cost/deletion";
+        if(!verification.getVerificationCode().contains("TEST")){
-
+            String host = "http://59.37.164.96:2506/action/cms/cost/deletion";
-        //TODO 请求伟成接口，删除 XLT_BIFyDbf
+
-        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+            //TODO 请求伟成接口，删除 XLT_BIFyDbf
-        XltDelVerificationDto delVerificationDto = new XltDelVerificationDto(
+            SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
-                sysUser.getAccount(),
+            XltDelVerificationDto delVerificationDto = new XltDelVerificationDto(
-                null,
+                    sysUser.getAccount(),
-                verification.getVerificationCode()
+                    null,
-        );
+                    verification.getVerificationCode()
-        String requestBody = JsonUtil.objectToJson(delVerificationDto);
+            );
-        String response = HttpUtil.doPost(host,requestBody,null);
+            String requestBody = JsonUtil.objectToJson(delVerificationDto);
-        String errorMsg = null;
+            String response = HttpUtil.doPost(host,requestBody,null);
-        if(!response.contains("200")){
+            String errorMsg = null;
-            errorMsg = response;
+            if(!response.contains("200")){
-        }
+                errorMsg = response;
-        SysSyncLog syncLog = new SysSyncLog();
+            }
-        syncLog.setFromPlat("移除核销记录");
+            SysSyncLog syncLog = new SysSyncLog();
-        syncLog.setUrl(host);
+            syncLog.setFromPlat("移除核销记录");
-        syncLog.setEntityClass(XltDelVerificationDto.class.getName());
+            syncLog.setUrl(host);
-        syncLog.setRequestJson(requestBody);
+            syncLog.setEntityClass(XltDelVerificationDto.class.getName());
-        syncLog.setFailReason(errorMsg);
+            syncLog.setRequestJson(requestBody);
-        syncLog.setSuccessStatus(errorMsg==null?0:1);
+            syncLog.setFailReason(errorMsg);
-        syncLog.setTodoState(0);
+            syncLog.setSuccessStatus(errorMsg==null?0:1);
-        syncLog.setTryTimes(0);
+            syncLog.setTodoState(0);
-        sysSyncLogService.save(syncLog);
+            syncLog.setTryTimes(0);
-        if(errorMsg!=null){
+            sysSyncLogService.save(syncLog);
-            Assert.throwEx(errorMsg);
+            if(errorMsg!=null){
+                Assert.throwEx(errorMsg);
+            }
         }
 
+
         verification.setVerificationState(VtbVerificationState.Cancel.getCode());
         vtbFundFlowService.removeByVerificationId(verification.getId());
         this.updateById(verification);
@@ -508,8 +511,20 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 Assert.throwEx("状态不支持释放活动费用");
             }
         }
-        BigDecimal releaseAmount = this.validActivity(costApply.getContractFlag()!=null
+        BigDecimal releaseAmount = null;
-                &&costApply.getContractFlag().equals(1),activity,false,false);
+        String errorMsg = null;
+        try {
+            releaseAmount = this.validActivity(costApply.getContractFlag()!=null
+                    &&costApply.getContractFlag().equals(1),activity,false,false);
+        } catch (Exception e) {
+            errorMsg = e.getMessage();
+        }
+        if(StringUtils.hasText(errorMsg)){
+            if(throwEx){
+                Assert.throwEx(errorMsg);
+            }
+            return;
+        }
         TbsActivity param = new TbsActivity();
         param.setId(activityId);
         param.setActivityState(TbsActivityState.STATE_4_Release);
@@ -942,6 +957,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                         .subtract(currActivityCenter.getUsedAmount())
                                 .subtract(centerAmt);
                 if(surplus.compareTo(BigDecimal.ZERO)<0){
+                    log.warn("SubjectCenterId:{} 当前输入金额:{}",centerBo.getSubjectCenterId(),centerAmt);
                     Assert.throwEx("SubjectCenterId: "+centerBo.getSubjectCenterId()+" 金额不足");
                 }
                 VtbVerificationSubjectCenter subjectCenter = new VtbVerificationSubjectCenter();
@@ -1437,7 +1453,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 &&verification.getRegReleaseFlag()!=null
                 &&verification.getRegReleaseFlag().equals(1)){
             //更新活动状态
-            this.release(verification.getActivityId(),"0",false);
+            SysUser sysUser = sysUserService.getById(verification.getRegReleaseUserId());
+            this.release(verification.getActivityId(),sysUser.getCode(),false);
         }
 
         BigDecimal totalCostApplyUsed = costApplyService.totalCostUsed(activity.getCostApplyId());