From c98641903320a6a572970b00141f252d634e76cd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 13 May 2025 16:21:54 +0800
Subject: [PATCH] feat(mall): 新增等级说明和佣金排行榜功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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..8f4e174 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("邮费模板不能为空");
+ }
}
}
--
Gitblit v1.9.1