From c10bc3cd81782fb7b21756580b9b0f0bb4eb0faa Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 11:03:10 +0800
Subject: [PATCH] 会员列表选择推销员
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 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 6774b7f..e46312b 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
@@ -69,6 +69,20 @@
if (mallGoodsByGoodsNo > 0) {
return new FebsResponse().fail().message("商品编号不能重复");
}
+ Integer carriageType = addMallGoodsDto.getCarriageType();
+ if(1 == carriageType){
+ if(ObjectUtil.isEmpty(addMallGoodsDto.getCarriageAmount())
+ || BigDecimal.ZERO.compareTo(addMallGoodsDto.getCarriageAmount()) >= 0){
+ return new FebsResponse().fail().message("固定邮费不能小于零");
+ }
+ }else{
+ Long carriageRuleId = addMallGoodsDto.getCarriageRuleId();
+ MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(carriageRuleId);
+ if(ObjectUtil.isEmpty(mallCarriageRule)){
+ return new FebsResponse().fail().message("邮费模板不能为空");
+ }
+ }
+
// 付费商品
if (addMallGoodsDto.getGoodsType() != 2) {
@@ -107,6 +121,10 @@
if (StrUtil.isEmpty(presentPrice)) {
return new FebsResponse().fail().message("商品规格现价不能为空");
}
+ BigDecimal goodsWeight = addSku.getGoodsWeight();
+ if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
+ return new FebsResponse().fail().message("重量不能小于零");
+ }
}
}
}
@@ -114,9 +132,9 @@
MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
- if (mallGoods.getHasCarriage() == 2) {
- mallGoods.setCarriage(BigDecimal.ZERO);
- }
+// if (mallGoods.getHasCarriage() == 2) {
+// mallGoods.setCarriage(BigDecimal.ZERO);
+// }
mallGoodsMapper.insert(mallGoods);
String thumbs = addMallGoodsDto.getThumbs();
@@ -156,6 +174,7 @@
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
+ sku.setGoodsWeight(mallGoods.getGoodsWeight());
mallGoodsSkuMapper.insert(sku);
return new FebsResponse().success().message("添加成功");
}
@@ -192,6 +211,8 @@
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
+ mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+ mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
mallGoodsSkuMapper.insert(mallGoodsSku);
}
}
@@ -293,6 +314,19 @@
if (mallGoodsByGoodsNo > 0) {
return new FebsResponse().fail().message("商品编号不能重复");
}
+ Integer carriageType = mallGoodsUpdateDto.getCarriageType();
+ if(1 == carriageType){
+ if(ObjectUtil.isEmpty(mallGoodsUpdateDto.getCarriageAmount())
+ || BigDecimal.ZERO.compareTo(mallGoodsUpdateDto.getCarriageAmount()) > 0){
+ return new FebsResponse().fail().message("固定邮费不能小于零");
+ }
+ }else{
+ Long carriageRuleId = mallGoodsUpdateDto.getCarriageRuleId();
+ MallCarriageRule mallCarriageRule = mallCarriageRuleMapper.selectById(carriageRuleId);
+ if(ObjectUtil.isEmpty(mallCarriageRule)){
+ return new FebsResponse().fail().message("邮费模板不能为空");
+ }
+ }
if (mallGoodsUpdateDto.getGoodsType() != 2) {
Long categoryId = mallGoodsUpdateDto.getCategoryId();
@@ -330,6 +364,10 @@
if (presentPrice.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("重量不能小于零");
+ }
}
}
@@ -345,9 +383,9 @@
}
BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
- if (mallGoods.getHasCarriage() == 2) {
- mallGoods.setCarriage(BigDecimal.ZERO);
- }
+// if (mallGoods.getHasCarriage() == 2) {
+// mallGoods.setCarriage(BigDecimal.ZERO);
+// }
mallGoodsMapper.updateById(mallGoods);
@@ -389,6 +427,7 @@
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
+ sku.setGoodsWeight(mallGoods.getGoodsWeight());
mallGoodsSkuMapper.insert(sku);
return new FebsResponse().success().message("添加成功");
}
@@ -450,6 +489,8 @@
mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
+ mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+ mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
mallGoodsSkuMapper.updateById(mallGoodsSku);
} else {
//新增商品规格
@@ -464,6 +505,8 @@
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
+ mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
+ mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
mallGoodsSkuMapper.insert(mallGoodsSku);
}
}
@@ -711,4 +754,10 @@
return new FebsResponse().success().message("操作成功");
}
+
+ @Override
+ public List<MallCarriageRule> findAllCarriageRuleTree() {
+ List<MallCarriageRule> mallCarriageRules = mallCarriageRuleMapper.selectList(new QueryWrapper<>());
+ return mallCarriageRules;
+ }
}
--
Gitblit v1.9.1