区域调整更新预算

src/main/java/com/qs/serve/modules/base/controller/JslApiController.java

@@ -54,8 +54,8 @@ public class JslApiController {
      * @param param
      * @return
      */
-    @PostMapping("/supplier/editBatch")
+    //@PostMapping("/supplier/editBatch")
-    @SysLog(module = SystemModule.BASE, title = "供应商", biz = BizType.INSERT)
+    //@SysLog(module = SystemModule.BASE, title = "供应商", biz = BizType.INSERT)
     @PreAuthorize("hasRole('bms:supplier:insert')")
     public R<?> editBatch(@RequestBody @Valid BmsSupplierBatchBo param){
         bmsSupplierService.editBatch(param);

src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java

@@ -40,7 +40,7 @@ public class BmsSubjectFormController {
      * @return
      */
     @GetMapping("/page")
-    @PreAuthorize("hasRole('bms:subjectForm:query')")
+    @PreAuthorize("hasRole('bms:subject:query')")
     public R<PageVo<BmsSubjectForm>> getPage(BmsSubjectForm param){
         BmsSubjectForm entity = CopierUtil.copy(param,new BmsSubjectForm());
         LambdaQueryWrapper<BmsSubjectForm> lqw = new LambdaQueryWrapper<>(entity);
@@ -88,8 +88,8 @@ public class BmsSubjectFormController {
     @PreAuthorize("hasRole('bms:subject:insert')")
     public R<?> save(@RequestBody @Valid BmsSubjectForm param){
         BmsSubjectForm entity = CopierUtil.copy(param,new BmsSubjectForm());
-        boolean result = bmsSubjectFormService.save(entity);
+        bmsSubjectFormService.save(entity);
-        return R.isTrue(result);
+        return R.ok(entity);
     }
 
     /**

src/main/java/com/qs/serve/modules/bms/entity/BmsSubjectForm.java

@@ -46,7 +46,6 @@ public class BmsSubjectForm implements Serializable {
 
     /** 表单json */
     @NotBlank(message = "表单json不能为空")
-    @Length(max = 0,message = "表单json长度不能超过0字")
     private String formContext;
 
     /** 表单版本 */

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java

@@ -14,14 +14,27 @@ import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.common.TbsGoodsType;
+import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
+import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
+import com.qs.serve.modules.tbs.mapper.TbsBudgetConditionMapper;
+import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
+import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 供应商 服务实现类
@@ -36,6 +49,9 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
     private BmsRegionService regionService;
     private BmsRegion2Service region2Service;
     private SysUserService sysUserService;
+    private TbsBudgetLogMapper budgetLogMapper;
+    private TbsBudgetMapper budgetMapper;
+    private TbsBudgetConditionMapper budgetConditionMapper;
 
     @Override
     public List<BmsSupplier> selectSupplierList(BmsSupplier bmsSupplier) {
@@ -43,8 +59,17 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(BmsSupplierBo param) {
         BmsSupplier supplier = CopierUtil.copy(param,new BmsSupplier());
+        String orgSaleRegionId = null;
+        String orgBizRegionId = null;
+        String editId = param.getId();
+        if(supplier.getId()!=null){
+            BmsSupplier dbSupplier = this.getById(param.getId());
+            orgSaleRegionId = dbSupplier.getRegionLast();
+            orgBizRegionId = dbSupplier.getRegion2Last();
+        }
         if(StringUtils.hasText(param.getMgrId())){
             SysUser sysUser = sysUserService.getById(param.getMgrId());
             supplier.setUserId(sysUser.getId());
@@ -69,14 +94,120 @@ public class BmsSupplierServiceImpl extends ServiceImpl<BmsSupplierMapper,BmsSup
         if(param.getRegionId()!=null){
             //绑定销售区域逻辑
             this.initRegion(supplier,param.getRegionId());
+            //判断是否需要迁移数据
+            if(editId!=null
+                    && orgSaleRegionId!=null
+                    &&!orgSaleRegionId.equals(param.getRegionId())){
+                migrateRegion(editId,TbsCenterType.saleRegion.name(), orgSaleRegionId, orgBizRegionId);
+            }
         }
         if(param.getRegionId2()!=null){
             //绑定行政区域逻辑
             this.initRegion2(supplier,param.getRegionId2());
+            //判断是否需要迁移数据
+            if(!orgBizRegionId.equals(param.getRegionId2())){
+
+            }
         }
         this.saveOrUpdate(supplier);
     }
 
+    private void migrateRegion(String supplierId, String regionType, String orgRegionId, String newRegionId) {
+        //todo 开发中
+        if(1==1){return;}
+        LambdaQueryWrapper<TbsBudgetLog> lqw4log = new LambdaQueryWrapper<>();
+        lqw4log.eq(TbsBudgetLog::getMigrateFlag,0);
+        lqw4log.eq(TbsBudgetLog::getRollbackFlag,0);
+        lqw4log.eq(TbsBudgetLog::getSupplierId, supplierId);
+        lqw4log.eq(TbsBudgetLog::getCenterType, regionType);
+        lqw4log.eq(TbsBudgetLog::getCenterId, orgRegionId);
+        List<TbsBudgetLog> budgetLogList = budgetLogMapper.selectList(lqw4log);
+        if(CollectionUtil.isNotEmpty(budgetLogList)){
+            //查询符合条件的预算
+            final List<Long> subjectIds = budgetLogList.stream().map(TbsBudgetLog::getSubjectId).distinct().collect(Collectors.toList());
+            LambdaQueryWrapper<TbsBudget> lqwBudget = new LambdaQueryWrapper<>();
+            lqwBudget.eq(TbsBudget::getCenterType,regionType);
+            lqwBudget.eq(TbsBudget::getCenterId, newRegionId);
+            lqwBudget.and(wq->{
+                wq.eq(TbsBudget::getSubjectId,0).or().in(TbsBudget::getSubjectId,subjectIds);
+            });
+            lqwBudget.orderByDesc(TbsBudget::getSubjectId); //将有科目条件的前置
+            List<TbsBudget> budgetList = budgetMapper.selectList(lqwBudget);
+            //查询预算条件
+            List<Long> conditionBudgetIds = budgetList.stream()
+                    .filter(a->a.getConditionFlag().equals(1))
+                    .map(TbsBudget::getId).distinct().collect(Collectors.toList());
+            Map<Long,List<TbsBudgetCondition>> budgetConditionsMap = null;
+            if(conditionBudgetIds.size()>0){
+                LambdaQueryWrapper<TbsBudgetCondition> conditionLqw = new LambdaQueryWrapper<>();
+                conditionLqw.in(TbsBudgetCondition::getBudgetId,conditionBudgetIds);
+                List<TbsBudgetCondition> budgetConditions = budgetConditionMapper.selectList(conditionLqw);
+                budgetConditionsMap = budgetConditions.stream().collect(Collectors.groupingBy(TbsBudgetCondition::getBudgetId));
+            }
+            //用于循环筛选条件
+            TbsGoodsType[] goodsTypes = new TbsGoodsType[]{
+                    TbsGoodsType.sku,
+                    TbsGoodsType.spu,
+                    TbsGoodsType.series,
+                    TbsGoodsType.category,
+                    TbsGoodsType.brand
+            };
+            //规则：品类条件比科目条件优先级更高
+            for (TbsBudgetLog budgetLog : budgetLogList) {
+                //（数据结构：value=预算id列表，key=商品类型）
+                Map<String,List<Long>> matchConditionBudgetIdsMap = new HashMap<>();
+                if(budgetConditionsMap!=null){
+                    for (Long budgetId : budgetConditionsMap.keySet()) {
+                        List<TbsBudgetCondition> budgetConditions = budgetConditionsMap.get(budgetId);
+                        String pathName = budgetLog.getTargetLevelPathNames();
+                        for (TbsBudgetCondition condition : budgetConditions) {
+                            if(pathName.contains(condition.getTargetLevelPathNames())){
+                                List<Long> tempList = matchConditionBudgetIdsMap.get(condition.getTargetType());
+                                if(tempList==null){
+                                    tempList = new ArrayList<>();
+                                }
+                                tempList.add(budgetId);
+                                matchConditionBudgetIdsMap.put(condition.getTargetType(),tempList);
+                                break;
+                            }
+                        }
+                    }
+                }
+                //记录匹配到的预算
+                TbsBudget matchBudget = null;
+                for (TbsBudget budget : budgetList) {
+                    if(matchBudget!=null){break;}
+                    if(budget.getConditionFlag().equals(1)){
+                        for (TbsGoodsType goodsType : goodsTypes) {
+                            if(matchBudget!=null){break;}
+                            List<Long> tempList = matchConditionBudgetIdsMap.get(goodsType.name());
+                            if(CollectionUtil.isNotEmpty(tempList)){
+                                for (Long budgetId01 : tempList) {
+                                    if(budgetId01.equals(budget.getId())){
+                                        matchBudget = budget;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }else {
+                        matchBudget = budget;
+                    }
+                }
+                //todo 设置已迁移记录
+                //todo 匹配条件
+            }
+            //设置已迁移状态
+            List<Long> budgetLogIds = budgetLogList.stream().map(TbsBudgetLog::getId).collect(Collectors.toList());
+            TbsBudgetLog updLogParam = new TbsBudgetLog();
+            updLogParam.setMigrateFlag(1);
+            LambdaQueryWrapper<TbsBudgetLog> updLogLqw = new LambdaQueryWrapper<>();
+            updLogLqw.in(TbsBudgetLog::getId,budgetLogIds);
+            budgetLogMapper.update(updLogParam,updLogLqw);
+
+        }
+    }
+
     @Override
     public BmsSupplier getByCode(String code,String belong) {
         LambdaQueryWrapper<BmsSupplier> lqw = new LambdaQueryWrapper<>();

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java

@@ -182,6 +182,11 @@ public class TbsBudgetLog implements Serializable {
      * */
     private Integer rollbackFlag;
 
+    /**
+     * 迁移标识：0-未迁移；1-已迁移
+     * */
+    private Integer migrateFlag;
+
     /** 所属租户 */
     @JsonIgnore
     @JsonProperty

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -51,6 +51,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private SeeYonService seeYonService;
     private TbsActivityTemplateService tbsActivityTemplateService;
     private TbsCostUnItemService tbsCostUnItemService;
+    private BmsSupplierService bmsSupplierService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -66,6 +67,10 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 Assert.throwEx("当前模板已停用");
             }
         }
+        BmsSupplier supplier = bmsSupplierService.getById(tbsCostApply.getSupplierId());
+        if(supplier.getCostFlag().equals(0)){
+            Assert.throwEx("["+supplier.getName()+"]无投放费用权限");
+        }
         TbsBudgetCostResult result = budgetApplicationService.buildBudgetCostResult(tbsCostApply.getId(),true,false);
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         sysUser.checkSyAccount();

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ project:
     url: 'http://192.168.0.9:7444'
   upload:
     #上传映射地址
-    proxy-url: http://183.234.29.228:6021/
+    proxy-url: http://192.168.0.9:9000/
     #物理存储地址
     logical-path: D:\\WebMapPath\\
 #腾讯云配置

src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   servlet:
     multipart:
-      max-file-size: 6MB
+      max-file-size: 100MB
-      max-request-size: 12MB
+      max-request-size: 160MB
   profiles:
     active: dev
   main: