From 1da9a96fd9f1031d81d5d829a2df18fd4ac5abd1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:42:48 +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 | 13 ++++++++++++-
1 files changed, 12 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 6d45814..b5d4a59 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -4,13 +4,24 @@
<select id="queryOrderList" resultType="com.xzx.gc.shop.vo.QueryOrderListVo">
SELECT
- *
+ a.*,
+ a.CREATED_TIME createTime,
+ 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 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.name like concat('%',#{name},'%')
+ </if>
<if test="status != null and status != ''">
and a.status = #{status}
</if>
--
Gitblit v1.9.1