From ff9ced34523e68c2d07fa39d0936f0077e1d93ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 13 Apr 2023 14:13:31 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 e46312b..a823a83 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
@@ -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{
@@ -120,6 +120,11 @@
String presentPrice = addSku.getPresentPrice();
if (StrUtil.isEmpty(presentPrice)) {
return new FebsResponse().fail().message("商品规格现价不能为空");
+ }
+ if (StrUtil.isEmpty(addSku.getLevelOnePrice())
+ || StrUtil.isEmpty(addSku.getLevelTwoPrice())
+ || StrUtil.isEmpty(addSku.getLevelThreePrice())) {
+ return new FebsResponse().fail().message("商品规格级别价格不能为空");
}
BigDecimal goodsWeight = addSku.getGoodsWeight();
if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
@@ -171,6 +176,9 @@
sku.setCostPrice(mallGoods.getCostPrice());
sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
+ sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
+ sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+ sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -208,6 +216,10 @@
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
+
+ mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice()));
+ mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
+ mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -364,6 +376,15 @@
if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
return new FebsResponse().fail().message("商品规格现价不能小于0");
}
+ if (addSku.getLevelOnePrice().compareTo(BigDecimal.ZERO) < 0) {
+ return new FebsResponse().fail().message("商品等级价格不能小于0");
+ }
+ if (addSku.getLevelTwoPrice().compareTo(BigDecimal.ZERO) < 0) {
+ return new FebsResponse().fail().message("商品等级价格不能小于0");
+ }
+ if (addSku.getLevelThreePrice().compareTo(BigDecimal.ZERO) < 0) {
+ return new FebsResponse().fail().message("商品等级价格不能小于0");
+ }
BigDecimal goodsWeight = addSku.getGoodsWeight();
if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
return new FebsResponse().fail().message("重量不能小于零");
@@ -388,6 +409,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();
@@ -424,6 +451,9 @@
sku.setCostPrice(mallGoods.getCostPrice());
sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
+ sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
+ sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+ sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -431,8 +461,6 @@
mallGoodsSkuMapper.insert(sku);
return new FebsResponse().success().message("添加成功");
}
-
-
// 删除已存在sku
List<Long> delSkuIds = mallGoodsUpdateDto.getDelSkuId();
@@ -462,6 +490,10 @@
if (ObjectUtil.isEmpty(mallGoodsStyleSku)) {
styles.add(addStyleDto.getStyleName());
}
+ }else{
+ MallGoodsStyle mallGoodsStyle = mallGoodsStyleMapper.selectById(addStyleDto.getStyleId());
+ mallGoodsStyle.setName(addStyleDto.getStyleName());
+ mallGoodsStyleMapper.updateById(mallGoodsStyle);
}
}
}
@@ -486,6 +518,9 @@
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+ mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
@@ -502,6 +537,9 @@
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+ mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -666,6 +704,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 +716,8 @@
adminMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
adminMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
adminCarriageRuleInfoVos.add(adminMallCarriageRuleInfoVo);
+
+ areaAddressStr.append(mallCarriageRuleInfo.getAreaAddress());
}else{
//默认规则
adminMallCarriageRuleVo.setBasicCntDefault(mallCarriageRuleInfo.getBasicCnt());
@@ -687,6 +728,7 @@
}
}
adminMallCarriageRuleVo.setAdminCarriageRuleInfoVos(adminCarriageRuleInfoVos);
+ adminMallCarriageRuleVo.setAreaAddressStr(areaAddressStr.toString());
}
return adminMallCarriageRuleVo;
}
@@ -709,6 +751,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