From d375fe94715d15bfa748991df5d922106a477e5d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Jun 2021 19:23:04 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 5b9675b..bd91fb4 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -4,13 +4,34 @@
<select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
SELECT
- *
+ a.*,
+ b.name name,
+ b.mobile_phone phone,
+ d.express_com expressCom,
+ d.express_no expressNo,
FROM
xzx_score_order a
+ left join xzx_user_info b where b.user_id = a.user_id
+-- left join xzx_score_order_details c where c.order_id = a.id
+ left join xzx_score_express_info d where d.order_id = a.id
WHERE 1 = 1
<if test="orderNo != null and orderNo != ''">
and a.order_no like concat('%',#{orderNo},'%')
</if>
+
+ <if test="name != null and name != ''">
+ and b.name like concat('%',#{name},'%')
+ </if>
+ <if test="status != null and status != ''">
+ and a.status = #{status}
+ </if>
+ <if test="createdTimeStart != null">
+ and a.CREATED_TIME >= #{createdTimeStart}
+ </if>
+
+ <if test="createdTimeEnd != null">
+ and a.CREATED_TIME >= #{createdTimeEnd}
+ </if>
order by a.CREATED_TIME desc
</select>
--
Gitblit v1.9.1