From 7c6f033b8754b07bf5c75ae8745a982d76f9abb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Sep 2022 19:28:14 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

---
 src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
index d466e4f..6b2ba37 100644
--- a/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsCategoryMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper">
 
     <select id="selectCategoryListInPage" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
-        SELECT m.id,m.name,b.name parentName,m.is_recommend isComand,m.image
+        SELECT m.id,m.name,b.name parentName,m.is_recommend isComand,m.image,m.index_num indexNum
                 FROM mall_goods_category m
                 left join mall_goods_category b on m.parent_id = b.id
         <where>
@@ -13,7 +13,7 @@
                 </if>
             </if>
         </where>
-        order by m.parent_id asc
+        order by m.parent_id,m.index_num asc
     </select>
 
     <select id="selectCategoryByName" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
@@ -49,16 +49,19 @@
         from mall_goods_category a
           left join mall_goods_category b on a.id=b.parent_id
         where a.parent_id = 0
+        order by a.index_num asc
     </select>
 
     <select id="selectCategoryListByParentId" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
         select * from mall_goods_category
         where parent_id=#{id}
+        order by index_num asc
     </select>
 
     <select id="selectRecommendCategoryList" resultType="cc.mrbird.febs.mall.entity.MallGoodsCategory">
         select * from mall_goods_category
         where parent_id=0 and is_recommend = 1
+        order by index_num asc
     </select>
 
     <select id="getMallGoodsCategoryInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo">

--
Gitblit v1.9.1