From bfa4d0fc1ce8d297fb2bea1c467ec335def8fa89 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 01:26:41 +0800
Subject: [PATCH] 团队业绩

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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..93e1db9 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
@@ -109,8 +109,11 @@
         //新增商品
         MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
         mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+        if (StrUtil.isBlank(mallGoods.getPresentPrice())) {
+            mallGoods.setPresentPrice(mallGoods.getOriginalPrice());
+        }
 
-        if (mallGoods.getHasCarriage() == 2) {
+        if (mallGoods.getHasCarriage() == null || mallGoods.getHasCarriage() == 2) {
             mallGoods.setCarriage(BigDecimal.ZERO);
         }
         mallGoodsMapper.insert(mallGoods);
@@ -341,7 +344,7 @@
         }
 
         BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
-        if (mallGoods.getHasCarriage() == 2) {
+        if (mallGoodsUpdateDto.getHasCarriage() == 2) {
             mallGoods.setCarriage(BigDecimal.ZERO);
         }
 

--
Gitblit v1.9.1