xiaoyong931011
2023-02-16 449a5e9804dbe371400e7bb45beacbc7521e3eea
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -672,6 +672,7 @@
        List<MallCarriageRuleInfo> mallCarriageRuleInfos = mallCarriageRuleInfoMapper.selectMallCarriageRuleInfoByRuleIdAndAreaAddress(id,null);
        if(CollUtil.isNotEmpty(mallCarriageRuleInfos)){
            StringBuffer areaAddressStr = new StringBuffer();
            List<AdminMallCarriageRuleInfoVo> adminCarriageRuleInfoVos = new ArrayList<>();
            for(MallCarriageRuleInfo mallCarriageRuleInfo : mallCarriageRuleInfos){
                if(StrUtil.isNotEmpty(mallCarriageRuleInfo.getAreaAddress())){
@@ -683,6 +684,8 @@
                    adminMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
                    adminMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
                    adminCarriageRuleInfoVos.add(adminMallCarriageRuleInfoVo);
                    areaAddressStr.append(mallCarriageRuleInfo.getAreaAddress());
                }else{
                    //默认规则
                    adminMallCarriageRuleVo.setBasicCntDefault(mallCarriageRuleInfo.getBasicCnt());
@@ -693,6 +696,7 @@
                }
            }
            adminMallCarriageRuleVo.setAdminCarriageRuleInfoVos(adminCarriageRuleInfoVos);
            adminMallCarriageRuleVo.setAreaAddressStr(areaAddressStr.toString());
        }
        return adminMallCarriageRuleVo;
    }
@@ -715,6 +719,9 @@
            }
            return new FebsResponse().fail().message(goodsNameBuffer+"正在使用当前模板,请先下架商品");
        }
        mallCarriageRule.setName(adminCarriageRuleUpdateDto.getRuleName());
        mallCarriageRuleMapper.updateById(mallCarriageRule);
        //删除现有的所有运费模板子表数据
        List<MallCarriageRuleInfo> mallCarriageRuleInfos = mallCarriageRuleInfoMapper.selectMallCarriageRuleInfoByRuleIdAndAreaAddress(id, null);
        if(CollUtil.isNotEmpty(mallCarriageRuleInfos)){