diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index c439b769..b1345cb8 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -80,7 +80,7 @@ public class VtbVerificationController { */ @DeleteMapping("/removeCheckById/{id}") public R removeVtbById(@PathVariable("id") Long id){ - + vtbVerificationService.removeCheck(id); return R.ok(); } 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 6e86a46a..892c8ef2 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 @@ -114,8 +114,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl vtbVerificationLqw = new LambdaQueryWrapper<>(); + vtbVerificationLqw.eq(VtbVerification::getActivityId,activity.getId()); + vtbVerificationLqw.ne(VtbVerification::getId,id); + List vtbVerificationList = this.list(vtbVerificationLqw); + BigDecimal totalVtbAmt = BigDecimal.ZERO; + for (VtbVerification vtbVerification : vtbVerificationList) { + totalVtbAmt = totalVtbAmt.add(vtbVerification.getAmount()); + } //更新活动状态 + TbsActivity activityUpdate = new TbsActivity(); + activityUpdate.setId(costApply.getId()); + activityUpdate.setActivityState(TbsActivityState.STATE_0_Todo); + activityUpdate.setUsedAmount(totalVtbAmt); + activityService.updateById(activityUpdate); + //更新活动其它表金额 + BigDecimal n100 = new BigDecimal("100"); + BigDecimal n10000 = new BigDecimal("10000"); + List activityCenterList = activityCenterService.listByActivity(activity.getId()); + for (TbsActivityCenter activityCenter : activityCenterList) { + activityCenter.setUsedAmount(totalVtbAmt.multiply(activityCenter.getCenterRate()).divide(n100,2, RoundingMode.DOWN)); + } + activityCenterService.updateBatchById(activityCenterList); + List centerGoodsList = activityCenterGoodsService.listByActivityId(activity.getId()); + for (TbsActivityCenterGoods centerGoods : centerGoodsList) { + centerGoods.setUsedAmount(totalVtbAmt.multiply(centerGoods.getCenterRate()).multiply(centerGoods.getCenterGoodsRate()).divide(n10000,2,RoundingMode.DOWN)); + } + activityCenterGoodsService.updateBatchById(centerGoodsList); //如果为最后的活动,更变费用申请状态 costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)); } @@ -137,11 +171,11 @@ public class VtbVerificationServiceImpl extends ServiceImpl