From c0cae0a68ec2d917a9fad1f093a16b6d1d16af3c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Mar 2023 13:41:37 +0800
Subject: [PATCH] 后台修改

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

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 5162606..a9d9f25 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -40,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>
@@ -58,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
@@ -72,6 +76,7 @@
                 a.goods_name,
                 a.goods_introdution goodsIntroduction,
                 a.thumb,
+                a.unit,
                 a.original_price,
                 a.present_price,
                 a.score,
@@ -80,6 +85,7 @@
                 a.carriage_amount,
                 a.carriage_rule_id,
                 a.goods_weight,
+                a.order_number,
                 min(b.id) skuId,
                 min(b.present_price) price,
                 sum(b.stock) stock,
@@ -111,11 +117,14 @@
                 </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">-->
+<!--                order by a.is_hot, a.saleVolume desc, a.id-->
+<!--            </if>-->
             <if test="record.sortType == 1">
-                order by a.is_hot, a.saleVolume desc, a.id
+                order by a.order_number ASC
             </if>
             <if test="record.sortType == 2">
                 order by a.saleVolume desc
@@ -305,6 +314,7 @@
         a.goods_name,
         a.goods_introdution goodsIntroduction,
         a.thumb,
+        a.unit,
         a.original_price,
         a.present_price,
         a.score,
@@ -313,6 +323,7 @@
         a.carriage_amount,
         a.carriage_rule_id,
         a.goods_weight,
+        a.order_number,
         min(b.id) skuId,
         min(b.present_price) price,
         sum(b.stock) stock,
@@ -344,11 +355,14 @@
             </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">-->
+<!--                order by a.is_hot, a.saleVolume desc, a.id-->
+<!--            </if>-->
             <if test="record.sortType == 1">
-                order by a.is_hot, a.saleVolume desc, a.id
+                order by a.order_number ASC
             </if>
             <if test="record.sortType == 2">
                 order by a.saleVolume desc

--
Gitblit v1.9.1