修复预算预览接口优先级异常

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<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
-                spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId());
+                spuLqw.eq(GoodsSpu::getCategoryThird,cate.getId( ));
                 List<GoodsSpu> spuList = goodsSpuService.list(spuLqw);
                 for (GoodsSpu goodsSpu : spuList) {
                     GoodsCategoryTreeVo spuNode = new GoodsCategoryTreeVo();

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<TbsBudgetMatchVo.BudgetVo> matchVos = new ArrayList<>();
             for (Long allowBudgetId : activityAllowBudgetIds) {
+                TbsBudget budget = null;
                 for (TbsBudget budget2 : budgetList) {
                     if(allowBudgetId.equals(budget2.getId())){
                         budget = budget2;

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<Long> 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);
+//        }
     }
 
     /**