From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 982862d..c6d1410 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -22,6 +22,8 @@
         <result property="hasCarriage" column="has_carriage" />
         <result property="carriage" column="carriage" />
         <result property="isNormal" column="is_normal" />
+        <result property="scorePercent" column="score_percent" />
+        <result property="sortCnt" column="sort_cnt" />
         <collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
             <id property="id" column="style_id" />
             <result property="name" column="style_name" />
@@ -72,6 +74,7 @@
                 a.present_price,
                 a.score,
                 a.is_hot,
+                a.sort_cnt,
                 min(b.present_price) price,
                 sum(b.sku_volume) saleVolume
             from mall_goods a
@@ -92,6 +95,9 @@
                     <if test="record.goodsType == 3">
                         and a.present_price = 0
                     </if>
+                    <if test="record.goodsLevel != null">
+                        and a.goods_level=#{record.goodsLevel}
+                    </if>
                     <if test="record.categoryId != null and record.categoryId != ''">
                         and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId})
                     </if>
@@ -103,22 +109,23 @@
             group by a.id
             order by a.id desc
         ) 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 == 2">
-                order by a.saleVolume desc
-            </if>
-            <if test="record.sortType == 3 and record.sort == 'asc'">
-                order by a.price
-            </if>
-            <if test="record.sortType == 3 and record.sort == 'desc'">
-                order by a.price desc
-            </if>
-            <if test="record.sortType == 4">
-                order by a.id desc
-            </if>
+        <if test="record.sortType == null">
+            order by a.sort_cnt asc
+        </if>
+        <if test="record.sortType == 1">
+            order by a.sort_cnt asc
+        </if>
+        <if test="record.sortType == 2">
+            order by a.saleVolume desc
+        </if>
+        <if test="record.sortType == 3 and record.sort == 'asc'">
+            order by a.price
+        </if>
+        <if test="record.sortType == 3 and record.sort == 'desc'">
+            order by a.price desc
+        </if>
+        <if test="record.sortType == 4">
+            order by a.id desc
         </if>
     </select>
 
@@ -137,6 +144,8 @@
         a.is_hot,
         a.score,
         a.is_normal,
+        a.sort_cnt,
+        a.score_percent,
         b.name categaryName,
         IFNULL(sum(c.sku_volume), a.volume) skuVolume,
         IFNULL(sum(c.stock), a.stock) stock
@@ -154,7 +163,7 @@
             </if>
         </where>
         group by a.id
-        order by a.created_time desc
+        order by a.is_normal,a.sort_cnt asc
     </select>
 
     <select id="selectMallGoodsCountByGoodsName" resultType="java.lang.Integer">

--
Gitblit v1.9.1