From 5ef09c49067552a2d4f65b0abbbfed4097dce028 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Mon, 3 Mar 2025 14:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/product/vo/ShopProductInfoVo.java    | 4 ++++
 .../src/main/java/com/czg/product/vo/ShopProductVo.java    | 4 ++++
 .../src/main/resources/mapper/ProductMapper.xml            | 7 ++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
index 257236c6..e5563799 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductInfoVo.java
@@ -90,6 +90,10 @@ public class ShopProductInfoVo implements Serializable {
      * 商品规格
      */
     private Object selectSpecInfo;
+    /**
+     * 打包费
+     */
+    private BigDecimal packFee;
     /**
      * 商品每周销售日 如：Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
index b1e66a51..2728c80f 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
@@ -82,6 +82,10 @@ public class ShopProductVo implements Serializable {
      * 是否热销 1-是 0-否
      */
     private Integer isHot;
+    /**
+     * 打包费
+     */
+    private BigDecimal packFee;
     /**
      * 商品规格列表
      */
diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
index 75b2b00f..d04cf455 100644
--- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
@@ -90,7 +90,8 @@
                t1.is_hot,
                ifnull(t2.suit_num, 1) as suit_num,
                t1.select_spec_info,
-               t1.group_snap
+               t1.group_snap,
+               t1.pack_fee
         from tb_product t1
                  left join (select x.product_id,
                                    x.id as sku_id,
@@ -161,10 +162,10 @@
     </select>
     <update id="updateProductStockNum">
         update tb_product
-        <if test="type == 'add">
+        <if test="type == 'add'">
             set stock_number = stock_number + #{num}
         </if>
-        <if test="type == 'sub">
+        <if test="type == 'sub'">
             set stock_number = stock_number - #{num}
         </if>
         where id = #{id}