From 0b3393b2485ef1905f44356e26f5cc1a48be9a83 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 21 May 2023 19:52:09 +0800
Subject: [PATCH] 正式环境
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 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..9da3641 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
@@ -117,9 +117,15 @@
if (StrUtil.isEmpty(originalPrice)) {
return new FebsResponse().fail().message("商品规格原价不能为空");
}
- String presentPrice = addSku.getPresentPrice();
- if (StrUtil.isEmpty(presentPrice)) {
- return new FebsResponse().fail().message("商品规格现价不能为空");
+ addSku.setPresentPrice(addSku.getOriginalPrice());
+// 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){
@@ -169,8 +175,12 @@
sku.setSkuImage(mallGoods.getThumb());
sku.setSkuName(mallGoods.getGoodsName());
sku.setCostPrice(mallGoods.getCostPrice());
- sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+// sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+ sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
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());
@@ -207,7 +217,12 @@
mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock());
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
- mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
+// mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
+ mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
+
+ 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());
@@ -360,9 +375,19 @@
if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) {
return new FebsResponse().fail().message("商品规格原价不能小于0");
}
- BigDecimal presentPrice = addSku.getPresentPrice();
- if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
- return new FebsResponse().fail().message("商品规格现价不能小于0");
+ addSku.setPresentPrice(addSku.getOriginalPrice());
+// BigDecimal presentPrice = addSku.getPresentPrice();
+// 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){
@@ -428,8 +453,12 @@
sku.setSkuImage(mallGoods.getThumb());
sku.setSkuName(mallGoods.getGoodsName());
sku.setCostPrice(mallGoods.getCostPrice());
- sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+// sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+ sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
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());
@@ -437,8 +466,6 @@
mallGoodsSkuMapper.insert(sku);
return new FebsResponse().success().message("添加成功");
}
-
-
// 删除已存在sku
List<Long> delSkuIds = mallGoodsUpdateDto.getDelSkuId();
@@ -468,6 +495,10 @@
if (ObjectUtil.isEmpty(mallGoodsStyleSku)) {
styles.add(addStyleDto.getStyleName());
}
+ }else{
+ MallGoodsStyle mallGoodsStyle = mallGoodsStyleMapper.selectById(addStyleDto.getStyleId());
+ mallGoodsStyle.setName(addStyleDto.getStyleName());
+ mallGoodsStyleMapper.updateById(mallGoodsStyle);
}
}
}
@@ -491,7 +522,11 @@
mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock());
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
- mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+ mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
+ mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
@@ -507,7 +542,11 @@
mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock());
mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
- mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+ mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
+ mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -672,6 +711,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 +723,8 @@
adminMallCarriageRuleInfoVo.setMoreCnt(mallCarriageRuleInfo.getMoreCnt());
adminMallCarriageRuleInfoVo.setMorePrice(mallCarriageRuleInfo.getMorePrice());
adminCarriageRuleInfoVos.add(adminMallCarriageRuleInfoVo);
+
+ areaAddressStr.append(mallCarriageRuleInfo.getAreaAddress());
}else{
//默认规则
adminMallCarriageRuleVo.setBasicCntDefault(mallCarriageRuleInfo.getBasicCnt());
@@ -693,6 +735,7 @@
}
}
adminMallCarriageRuleVo.setAdminCarriageRuleInfoVos(adminCarriageRuleInfoVos);
+ adminMallCarriageRuleVo.setAreaAddressStr(areaAddressStr.toString());
}
return adminMallCarriageRuleVo;
}
@@ -715,6 +758,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