From ff55c5334fc35594d2f0c680c29afd309cf367a2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 22 May 2025 10:51:36 +0800
Subject: [PATCH] feat(mall): 添加商品佣金设置并调整相关功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 82 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 34 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 dcb5000..d2a5c45 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
@@ -73,16 +73,18 @@
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() == 1) {
+ 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("邮费模板不能为空");
+ }
}
}
@@ -124,10 +126,14 @@
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("商品规格级别价格不能为空");
+ if (StrUtil.isEmpty(addSku.getLevelOnePrice())) {
+ return new FebsResponse().fail().message("佣金不能为空");
+ }
+
+ BigDecimal costPrice = addSku.getCostPrice();
+ BigDecimal levelOnePrice = new BigDecimal(addSku.getLevelOnePrice());
+ if (levelOnePrice.compareTo(costPrice) >= 0) {
+ return new FebsResponse().fail().message("佣金要小于成本价");
}
BigDecimal goodsWeight = addSku.getGoodsWeight();
if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
@@ -199,8 +205,8 @@
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.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+// sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -237,12 +243,11 @@
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.getOriginalPrice()));
-
+ 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.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
+// mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -401,6 +406,15 @@
if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
return new FebsResponse().fail().message("商品规格现价不能小于0");
}
+ if (ObjectUtil.isEmpty(addSku.getLevelOnePrice())) {
+ return new FebsResponse().fail().message("佣金不能为空");
+ }
+
+ BigDecimal costPrice = addSku.getCostPrice();
+ BigDecimal levelOnePrice = addSku.getLevelOnePrice();
+ if (levelOnePrice.compareTo(costPrice) >= 0) {
+ return new FebsResponse().fail().message("佣金要小于成本价");
+ }
BigDecimal goodsWeight = addSku.getGoodsWeight();
if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
return new FebsResponse().fail().message("重量不能小于零");
@@ -486,9 +500,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.setLevelOnePrice(mallGoods.getLevelOnePrice());
+// sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+// sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -552,11 +566,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.getOriginalPrice());
- mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
- mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
- mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ 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());
@@ -572,11 +586,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.getOriginalPrice());
- mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
- mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
- mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ 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());
--
Gitblit v1.9.1