diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 57efd8ac..6bcce650 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -218,10 +218,11 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService public Object doFinished(TbsAffairCommitBo param) { Long targetId = Long.parseLong(this.getTargetId(param)); // 更新金额 - BigDecimal totalApply = checkToChangeAmount(param, targetId); TbsCostApply apply = new TbsCostApply(); + // TODO 1.有修改金额为0的异常;2.需要调整预算占用 +// BigDecimal totalApply = checkToChangeAmount(param, targetId); +// apply.setTotalActivityAmount(totalApply); apply.setId(targetId); - apply.setTotalActivityAmount(totalApply); apply.setChargeState(TbsCostApplyState.State_2_actioning.getCode()); costApplyService.updateById(apply); TbsCostApply costApply = costApplyService.getById(targetId); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationContactBo.java b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationContactBo.java index 8107d450..60b2ede1 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationContactBo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationContactBo.java @@ -21,6 +21,7 @@ public class VtbVerificationContactBo { private BigDecimal totalCheckAmount; /** 核销人员工号 */ + @NotNull private String userCode; /** 条款编码 */ 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 33a0c728..eca0325f 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 @@ -134,13 +134,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl activitySubjectList = activitySubjectService.listByActivityId(activity.getId()); List activityCenterList = activityCenterService.listByActivity(activity.getId()); List activityCenterGoodsList = activityCenterGoodsService.listByActivityId(activity.getId()); - BigDecimal tempTotal = finalAmt; + BigDecimal tempTotal = param.getTotalCheckAmount(); BigDecimal n100 = new BigDecimal("100"); BigDecimal n10000 = new BigDecimal("10000"); List activityCenters4Update = new ArrayList<>(); List activitySubject4Update = new ArrayList<>(); for (TbsActivitySubject activitySubject : activitySubjectList) { - BigDecimal surplusAmt = activitySubject.getAmount().subtract(activitySubject.getUsedAmount()); + if(tempTotal.compareTo(BigDecimal.ZERO)<1){ + break; + } + BigDecimal totalCenterUsedAmt = BigDecimal.ZERO; + BigDecimal totalCenterAmt = BigDecimal.ZERO; + for (TbsActivityCenter activityCenter : activityCenterList) { + totalCenterAmt = totalCenterAmt.add(activityCenter.getCenterAmount()); + totalCenterUsedAmt = totalCenterUsedAmt.add(activityCenter.getUsedAmount()); + } + BigDecimal surplusAmt = totalCenterAmt.subtract(totalCenterUsedAmt); if(surplusAmt.compareTo(BigDecimal.ZERO)<=0){ continue; } @@ -185,6 +194,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl