From 86219c38299e72fdd5e1251803e38cc91938d9bb Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Sun, 17 Dec 2023 18:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml   | 4 ++++
 .../yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
index fba1d5b..4d0de87 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
@@ -125,6 +125,9 @@
         LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
         UNION
         SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
         c.`code`,
@@ -142,6 +145,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        ORDER BY reserveDate DESC
     </select>
     <select id="exportExcel" resultType="com.yxt.yyth.api.lpkreserveorder.ReserveOrderExport">
         select
diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
index 5eb611e..e5b0477 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
@@ -404,8 +404,11 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<LpkReserveOrder> qw = new QueryWrapper<>();
+        if(StringUtils.isBlank(query.getUserSid())){
+            return rb.setMsg("参数不全");
+        }
         qw.eq("o.customerSid", query.getUserSid());
-        qw.orderByDesc("reserveDate");
+//        qw.orderByDesc("reserveDate");
         IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<LpkReserveOrderCardVo> pagging = baseMapper.orderListByUserSid(page, qw);
         for(LpkReserveOrderCardVo vo:pagging.getRecords()){