增加活动公告

xiaoyong931011

2023-03-01 c3f2f93821ac8d351fe7c9d1f0f28c39b36cfef1

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

@@ -72,7 +72,7 @@
        Integer carriageType = addMallGoodsDto.getCarriageType();
        if(1 == carriageType){
            if(ObjectUtil.isEmpty(addMallGoodsDto.getCarriageAmount())
                    || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) >= 0){
                    || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) > 0){
                return new FebsResponse().fail().message("固定邮费不能小于零");
            }
        }else{
@@ -389,6 +389,12 @@

        mallGoodsMapper.updateById(mallGoods);

        if( 1 == mallGoods.getCarriageType()){
            mallGoodsMapper.updateCarriageRuleId(mallGoods.getId());
        }else{
            mallGoodsMapper.updateCarriageAmount(mallGoods.getId());
        }

        mallGoodsImagesMapper.deleteByGoodsId(mallGoodsUpdateDto.getId());
        String thumbs = mallGoodsUpdateDto.getThumbs();
        if (StrUtil.isNotEmpty(thumbs)) {
@@ -462,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);
                }
            }
        }
@@ -666,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())){
@@ -677,6 +688,8 @@
                    adminMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
                    adminMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
                    adminCarriageRuleInfoVos.add(adminMallCarriageRuleInfoVo);

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