From bf30c4b1b5bfefeff98e640ea248dd169d6bce8b Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 18 May 2023 18:11:39 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |    4 ++--
 1 files changed, 2 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..28c9dd7 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
@@ -110,7 +110,7 @@
         MallGoods mallGoods = MallGoodsConversion.INSTANCE.dtoToEntity(addMallGoodsDto);
         mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
 
-        if (mallGoods.getHasCarriage() == 2) {
+        if (mallGoods.getHasCarriage() == null || mallGoods.getHasCarriage() == 2) {
             mallGoods.setCarriage(BigDecimal.ZERO);
         }
         mallGoodsMapper.insert(mallGoods);
@@ -341,7 +341,7 @@
         }
 
         BeanUtil.copyProperties(mallGoodsUpdateDto, mallGoods);
-        if (mallGoods.getHasCarriage() == 2) {
+        if (mallGoodsUpdateDto.getHasCarriage() == 2) {
             mallGoods.setCarriage(BigDecimal.ZERO);
         }
 

--
Gitblit v1.9.1