From c5658e3ed83cbc9409dddd8a76d57c55338e3d97 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 9 Jan 2023 14:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=AE=97=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=85=88=E7=BA=A7=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GoodsCategoryController.java | 2 +- .../TbsActivityApplicationService.java | 3 +- .../service/TbsBudgetApplicationService.java | 53 ++++++++++++------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java index 67f1e739..173bd054 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java @@ -96,7 +96,7 @@ public class GoodsCategoryController { treeNode.setEnable(cate.getEnable()+""); if(loadSpuData && cate.getLevel().equals(3)){ LambdaQueryWrapper spuLqw = new LambdaQueryWrapper<>(); - spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId()); + spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId( )); List spuList = goodsSpuService.list(spuLqw); for (GoodsSpu goodsSpu : spuList) { GoodsCategoryTreeVo spuNode = new GoodsCategoryTreeVo(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java index 8ee8ed38..087e0f56 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java @@ -93,9 +93,10 @@ public class TbsActivityApplicationService { BigDecimal totalAllAmount = BigDecimal.ZERO; BigDecimal totalAllHisAmount = BigDecimal.ZERO; if(CollectionUtil.isNotEmpty(activityAllowBudgetIds)){ - TbsBudget budget = null; + activityAllowBudgetIds = activityAllowBudgetIds.stream().distinct().collect(Collectors.toList()); List matchVos = new ArrayList<>(); for (Long allowBudgetId : activityAllowBudgetIds) { + TbsBudget budget = null; for (TbsBudget budget2 : budgetList) { if(allowBudgetId.equals(budget2.getId())){ budget = budget2; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index bb8899b7..77bfafb9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -259,11 +259,19 @@ public class TbsBudgetApplicationService { budgetIds = new ArrayList<>(); } budgetIds.add(budget.getId()); + budgetIds.addAll(budgetIdsOfActivity); activityAllowBudgetIdMap.put(activity.getId(),budgetIds); } + }else { + List budgetIds = activityAllowBudgetIdMap.get(activity.getId()); + if(budgetIds==null){ + budgetIds = new ArrayList<>(); + } + budgetIds.add(budget.getId()); + budgetIds.addAll(budgetIdsOfActivity); + activityAllowBudgetIdMap.put(activity.getId(),budgetIds); } } - activityAllowBudgetIdMap.put(activity.getId(),budgetIdsOfActivity); } return activityAllowBudgetIdMap; } @@ -437,11 +445,15 @@ public class TbsBudgetApplicationService { //记录当前费用使用考核期费用 lastAmount = lastAmount.add(goodsAmount); counterMap.put(itemBudget.getId(),lastAmount); + actMatchList.add(activityCostItem); break; } } //无匹配的预算 if(!isMatch){ + if (throwEx){ + Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]预算不足"); + } if(overspend){ TbsScheduleItemBudget itemBudget = currentScheduleItemBudgets.get(0); activityCostItem.setBudgetId(itemBudget.getBudgetId()); @@ -456,28 +468,29 @@ public class TbsBudgetApplicationService { } lastAmount = lastAmount.add(goodsAmount); counterMap.put(itemBudget.getId(),lastAmount); - }else if (throwEx){ - Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]预算不足"); + actMatchList.add(activityCostItem); + }else{ + activityCostItem.setBudgetId(0L); + activityCostItem.setScheduleId(0L); + activityCostItem.setScheduleItemId(0L); + activityCostItem.setScheduleItemBudgetId(0L); + activityCostItem.setScheduleItemName("无"); + actUnMatchList.add(activityCostItem); } - activityCostItem.setBudgetId(0L); - activityCostItem.setScheduleId(0L); - activityCostItem.setScheduleItemId(0L); - activityCostItem.setScheduleItemBudgetId(0L); - activityCostItem.setScheduleItemName("无"); - } - actMatchList.add(activityCostItem); - }else { - if(throwEx){ - Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算"); } - //添加到预算超支表 - activityCostItem.setBudgetId(0L); - activityCostItem.setScheduleId(0L); - activityCostItem.setScheduleItemId(0L); - activityCostItem.setScheduleItemBudgetId(0L); - activityCostItem.setScheduleItemName("无"); - actUnMatchList.add(activityCostItem); } +// else { +// if(throwEx){ +// Assert.throwEx("品类["+ activityCostItem.getTargetName()+"]无可用预算"); +// } +// //添加到预算超支表 +// activityCostItem.setBudgetId(0L); +// activityCostItem.setScheduleId(0L); +// activityCostItem.setScheduleItemId(0L); +// activityCostItem.setScheduleItemBudgetId(0L); +// activityCostItem.setScheduleItemName("无"); +// actUnMatchList.add(activityCostItem); +// } } /**