From 1798c91f6b0782d1970a8a4fdcaf4a174e68cb61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 五月 2023 10:45:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
index c54cda9..e05ff23 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
@@ -85,7 +85,7 @@
a.startPrice
from t_order a
left join t_app_user b on (a.userId = b.id)
- where a.`status` = 1 and a.hallOrder = 1 and a.state = 101 order by a.createTime desc
+ where a.`status` = 1 and a.hallOrder = 1 and a.state in (101, 201) order by a.createTime desc
</select>
@@ -93,6 +93,7 @@
<select id="queryOrderInfo" resultType="com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper">
select
a.id,
+ b.id as userId,
b.avatar,
a.userName,
a.userPhone,
--
Gitblit v1.7.1