From 397f1fccabd2bd772e8e4b926c0001fc34e59445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 13 Jul 2024 15:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E8=BF=91=E6=8A=80=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArtificerServiceImpl.java      |  2 +-
 .../resources/mapper/artificer/OrdersDao.xml    | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
index e44a6fe..748c2cb 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
@@ -662,7 +662,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
     public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){
         Map<String, Object> map = new HashMap<String, Object>();
         Page<Artificer> pages=new Page<>(page,limit);
-        IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart,null);
+        IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null);
         map.put("nearData",new PageUtils(artificerIPage));
         map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city)));
         return Result.success(map);
diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml
index b58cb63..308a7f3 100644
--- a/src/main/resources/mapper/artificer/OrdersDao.xml
+++ b/src/main/resources/mapper/artificer/OrdersDao.xml
@@ -799,7 +799,7 @@
         <if test="type==5">
             and date_format(o.serve_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and o.status=2
         </if>
-        order by serve_time desc
+        order by serve_time desc, orders_id desc
     </select>
 
     <select id="selectDividedIntoDetails" resultType="com.sqx.modules.artificer.entity.Orders">
@@ -1561,21 +1561,6 @@
     </select>
 
     <select id="getChongzhiList" resultType="com.sqx.modules.artificer.entity.Orders">
-<!--        select-->
-<!--        o.*,uu.user_recharge as userRecharge,b.massage_img-->
-<!--        from orders o-->
-<!--        left join artificer a on a.artificer_id=o.artificer_id-->
-<!--        left join user_recharge uu on uu.orders_id = o.orders_id-->
-<!--        left join massage_type b on o.massage_type_id = b.massage_type_id-->
-<!--        where o.artificer_id=#{userId} and o.parent_id = 0-->
-<!--        and o.status in (3,5,15)-->
-<!--        and o.end_times BETWEEN #{startTime} and #{endTime}-->
-<!--        <if test="isSfwc != null and isSfwc == 0">-->
-<!--            and uu.type is null-->
-<!--        </if>-->
-<!--        <if test="isSfwc != null and isSfwc == 1">-->
-<!--            and uu.type = 2-->
-<!--        </if>-->
         select o.*,
             (case when o.user_package_detail_id is null then m.title else bl.title end ) as title,
             (case when o.user_package_detail_id is null then m.massage_img else bl.massage_img end ) as massageImg,