From fefa68e08d3d2e97f57a583c5df5883231641f75 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 18:26:39 +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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 6d45814..7ab55eb 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -4,12 +4,23 @@
<select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime,
+ b.nick_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 on b.user_id = a.user_id
+ left join xzx_score_express_info d on 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.nick_name like concat('%',#{name},'%')
</if>
<if test="status != null and status != ''">
and a.status = #{status}
@@ -19,7 +30,7 @@
</if>
<if test="createdTimeEnd != null">
- and a.CREATED_TIME >= #{createdTimeEnd}
+ and a.CREATED_TIME <= #{createdTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
--
Gitblit v1.9.1