增加活动公告

xiaoyong931011

2023-03-02 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java

@@ -468,6 +468,10 @@
                    if (ObjectUtil.isEmpty(mallGoodsStyleSku)) {
                        styles.add(addStyleDto.getStyleName());
                    }
                }else{
                    MallGoodsStyle mallGoodsStyle = mallGoodsStyleMapper.selectById(addStyleDto.getStyleId());
                    mallGoodsStyle.setName(addStyleDto.getStyleName());
                    mallGoodsStyleMapper.updateById(mallGoodsStyle);
                }
            }
        }
@@ -672,6 +676,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 +688,8 @@
                    adminMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
                    adminMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
                    adminCarriageRuleInfoVos.add(adminMallCarriageRuleInfoVo);

                    areaAddressStr.append(mallCarriageRuleInfo.getAreaAddress());
                }else{
                    //默认规则
                    adminMallCarriageRuleVo.setBasicCntDefault(mallCarriageRuleInfo.getBasicCnt());
@@ -693,6 +700,7 @@
                }
            }
            adminMallCarriageRuleVo.setAdminCarriageRuleInfoVos(adminCarriageRuleInfoVos);
            adminMallCarriageRuleVo.setAreaAddressStr(areaAddressStr.toString());
        }
        return adminMallCarriageRuleVo;
    }
@@ -715,6 +723,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)){