From 0b459f932333ab6b67fe5aaac6b8bff871ada5f6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Feb 2023 14:54:53 +0800
Subject: [PATCH] 运费模板指定省份不能重复
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index 94b3d3e..ee9826b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/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)){
--
Gitblit v1.9.1