From ba97aeddafe218b91ba16f3e236274aad7a289ab Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Tue, 1 Aug 2023 11:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/controller/TbsBudgetController.java | 9 ++++++ .../modules/tbs/service/TbsBudgetService.java | 2 ++ .../service/impl/TbsBudgetServiceImpl.java | 32 ++++++++++++++----- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index a01cf892..8726552d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -348,5 +348,14 @@ public class TbsBudgetController { tbsBudgetService.moveBudgetAmount(bo); return R.ok(); } + + @PostMapping("/updateBudgetAfterStart") + public R updateBudgetAfterStart(@RequestBody @Valid TbsBudgetBo param){ + if(param.getId()==null){ + Assert.throwEx("预算ID不能为空!"); + } + tbsBudgetService.updateBudgetAfterStart(param); + return R.ok(); + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java index 882030f0..9035a6fe 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java @@ -45,5 +45,7 @@ public interface TbsBudgetService extends IService { void moveCenterBudgetAndCostAmount(String sourceId,String sourceType,String targetId,String targetType); void moveBudgetAmount(TbsBudgetMoveAmountBo bo); + + void updateBudgetAfterStart(TbsBudgetBo param); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 085adf7f..e1b42411 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -680,15 +680,15 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetConditions.addAll(buildCategoryCondition(budgetId, seriesIds, TbsGoodsType.series.name())); budgetConditions.addAll(buildCategoryCondition(budgetId, categoryIds, TbsGoodsType.category.name())); budgetConditions.addAll(buildCategoryCondition(budgetId, brandIds, TbsGoodsType.brand.name())); - TbsBudget tbsBudget = new TbsBudget(); - tbsBudget.setId(budgetId); - if(CollectionUtil.isNotEmpty(budgetConditions)){ - budgetConditionService.saveBatch(budgetConditions); - tbsBudget.setConditionFlag(1); - }else { - tbsBudget.setConditionFlag(0); + TbsBudget oriBudget = this.getById(budgetId); + if (oriBudget.getBudgetState() != 1 + || oriBudget.getConditionFlag() != 1 + || CollectionUtil.isNotEmpty(budgetConditions)) { + TbsBudget tbsBudget = new TbsBudget(); + tbsBudget.setId(budgetId); + tbsBudget.setConditionFlag(CollectionUtil.isNotEmpty(budgetConditions) ? 1 : 0); + this.updateById(tbsBudget); } - this.updateById(tbsBudget); } @@ -932,5 +932,21 @@ public class TbsBudgetServiceImpl extends ServiceImpl budgetLogService.saveBatch(budgetLogList); } + + @Override + public void updateBudgetAfterStart(TbsBudgetBo param) { + TbsBudget budget = this.getById(param.getId()); + if(budget==null){ + Assert.throwEx("不存在该预算!"); + } + if(!budget.getBudgetState().equals(1)){ + Assert.throwEx("预算未开启,请直接编辑!"); + } + budget.setBudgetCode(param.getBudgetCode()); + budget.setAttachIds(param.getAttachIds()); + this.updateById(budget); + buildCondition(budget.getId(),param.getBrandIds(),param.getCategoryIds(),param.getSeriesIds(),param.getSpuIds(),param.getSkuIds()); + + } }