From e70f0cc17b3377a1e200490df94cda368098ff08 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 14:24:26 +0800
Subject: [PATCH] 短信认证
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 38d33de..e80ebd8 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
@@ -83,6 +83,13 @@
}
}
+ if(addMallGoodsDto.getIsNormal() == 5){
+ if(ObjectUtil.isEmpty(addMallGoodsDto.getHouseAddress())
+ || ObjectUtil.isEmpty(addMallGoodsDto.getHouseName())){
+ return new FebsResponse().fail().message("请填写酒店信息");
+ }
+ }
+
// 付费商品
if (addMallGoodsDto.getGoodsType() != 2) {
@@ -181,8 +188,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());
@@ -345,6 +352,13 @@
}
}
+ if(mallGoodsUpdateDto.getIsNormal() == 5){
+ if(ObjectUtil.isEmpty(mallGoodsUpdateDto.getHouseAddress())
+ || ObjectUtil.isEmpty(mallGoodsUpdateDto.getHouseName())){
+ return new FebsResponse().fail().message("请填写酒店信息");
+ }
+ }
+
if (mallGoodsUpdateDto.getGoodsType() != 2) {
Long categoryId = mallGoodsUpdateDto.getCategoryId();
if (ObjectUtil.isEmpty(categoryId)) {
@@ -459,8 +473,8 @@
// 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.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+ sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -527,8 +541,8 @@
mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
-// mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
-// mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
@@ -547,8 +561,8 @@
mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
-// mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
-// mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+ mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
--
Gitblit v1.9.1