From 06378c983b9294338ac9ea36f055fe61332e354b Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 6 Apr 2023 23:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=BC=96=E8=BE=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/goods/service/impl/GoodsServiceImpl.java    | 3 +++
 ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml    | 1 +
 .../src/main/resources/mapper/goods/GoodsStandardMapper.xml  | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsServiceImpl.java b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsServiceImpl.java
index d4de1dec..09f221a3 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsServiceImpl.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/service/impl/GoodsServiceImpl.java
@@ -180,6 +180,9 @@ public class GoodsServiceImpl implements GoodsService {
             if (goodsStandard.getExtMoney() == null) {
                 goodsStandard.setExtMoney(BigDecimal.ZERO);
             }
+            if (goodsStandard.getGroupPrice() == null) {
+                goodsStandard.setGroupPrice(BigDecimal.ZERO);
+            }
         });
 
         // 批量删除各组件
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 19fd68f0..25caeb30 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -43,6 +43,7 @@
         UPDATE goods
         <set>
             <if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
+            <if test="goodsDesc != null and goodsDesc != ''">goods_desc = #{goodsDesc},</if>
             <if test="goodsSort != null and goodsSort != ''">goods_sort = #{goodsSort},</if>
             <if test="deptGoodsCategoryId != null and deptGoodsCategoryId != ''">dept_goods_category_id = #{deptGoodsCategoryId},</if>
             <if test="goodsImgUrl != null and goodsImgUrl != ''">goods_img_url = #{goodsImgUrl},</if>
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
index 826e53fd..b1db3517 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml
@@ -102,7 +102,7 @@
         DELETE FROM goods_standard
         WHERE goods_id = #{goodsId}
     </delete>
-    
+
     <update id="updateSaleNum">
         update
             goods_standard
@@ -122,7 +122,8 @@
             <if test="extMoney != null">ext_money = #{extMoney},</if>
             <if test="discountPrice != null">discount_price = #{discountPrice},</if>
             <if test="groupPrice != null">group_price = #{groupPrice},</if>
-            <if test="goodsUnit != null and goodsUnit != ''">goods_unit = #{goodsUnit},</if>
+            <if test="goodsUnit != null">goods_unit = #{goodsUnit},</if>
+            <if test="goodsNum != null">goods_num = #{goodsNum},</if>
             <if test="status != null">`status` = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
             update_time = sysdate()