From 69b2dfc245c5b761db44b70b1653c3b4d97f1564 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Feb 2023 11:22:19 +0800
Subject: [PATCH] ε•†ε“ζŽ’εΊ

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 4d6688c..b5bf405 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -22,6 +22,10 @@
         <result property="hasCarriage" column="has_carriage" />
         <result property="carriage" column="carriage" />
         <result property="isNormal" column="is_normal" />
+        <result property="carriageType" column="carriage_type" />
+        <result property="carriageAmount" column="carriage_amount" />
+        <result property="carriageRuleId" column="carriage_rule_id" />
+        <result property="goodsWeight" column="goods_weight" />
         <collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
             <id property="id" column="style_id" />
             <result property="name" column="style_name" />
@@ -36,6 +40,8 @@
                 <result property="presentPrice" column="sku_present_price" />
                 <result property="styleId" column="sku_style_id"/>
                 <result property="goodsId" column="sku_goods_id" />
+                <result property="skuGoodsWeight" column="sku_goods_weight" />
+                <result property="sample" column="sample" />
             </collection>
         </collection>
     </resultMap>
@@ -54,6 +60,8 @@
             c.original_price sku_original_price,
             c.present_price sku_present_price,
             c.style_id sku_style_id,
+            c.goods_weight sku_goods_weight,
+            c.sample sample,
             c.goods_id sku_goods_id
         from mall_goods a
           left join mall_goods_style b on a.id = b.goods_id
@@ -107,7 +115,7 @@
                 </if>
             </where>
             group by a.id
-            order by a.id desc
+            order by a.order_number ASC
         ) a
         <if test="record.sortType != null">
             <if test="record.sortType == 1">
@@ -282,6 +290,18 @@
         where id=#{id} and  volume - #{cnt} <![CDATA[ >= ]]> 0
     </update>
 
+    <update id="updateCarriageRuleId">
+        update mall_goods
+        set carriage_rule_id = null
+        where id=#{id}
+    </update>
+
+    <update id="updateCarriageAmount">
+        update mall_goods
+        set carriage_amount = null
+        where id=#{id}
+    </update>
+
     <select id="selectMallGoodsListQueryNoPage" resultType="cc.mrbird.febs.mall.vo.MallGoodsListVo">
         select * from (
         select
@@ -328,7 +348,7 @@
             </if>
         </where>
         group by a.id
-        order by a.id desc
+        order by a.order_number ASC
         ) a
         <if test="record.sortType != null">
             <if test="record.sortType == 1">

--
Gitblit v1.9.1