From 286f1b16d0b16e117b7aea4bd230c5a0ace92267 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Mar 2023 11:21:44 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 6 ++++++
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 2 ++
3 files changed, 9 insertions(+), 1 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 14dcdcf..0c29ffa 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
@@ -341,7 +341,7 @@
}
BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
- if (mallGoods.getHasCarriage() == 2) {
+ if (mallGoodsUpdateDto.getHasCarriage() == 2) {
mallGoods.setCarriage(BigDecimal.ZERO);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d3d0c5a..b22cb17 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -861,7 +861,13 @@
BigDecimal total = BigDecimal.ZERO;
for (AddOrderItemDto item : addOrderDto.getItems()) {
MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
+ if(ObjectUtil.isEmpty(sku)){
+ throw new FebsException("商品已更新，请重新下单");
+ }
MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+ if(ObjectUtil.isEmpty(mallGoods)){
+ throw new FebsException("商品已更新，请重新下单");
+ }
/**
* 贡献点判断
*/
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 6d52229..79c7050 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -682,6 +682,8 @@
"presentPrice": goodsInfo.presentPrice,
"costPrice": goodsInfo.costPrice,
"isSku": goodsInfo.isSku,
+ "hasCarriage": goodsInfo.hasCarriage,
+ "carriage": goodsInfo.carriage,
"thumb": goodsInfo.thumb,
"star": goodsInfo.star,
"sortCnt": goodsInfo.sortCnt,
--
Gitblit v1.9.1