From 462d7cf7fc4a4dd2ba7060832f6fd007ee1618c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 16:38:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index a519661..6128a0c 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -7,7 +7,7 @@
     </select>
 
     <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
-        select *
+        select *,b.name memberName,b.phone memberPhone
         from mall_order_info a
         left join mall_member b on a.member_id = b.id
         <where>
@@ -96,6 +96,9 @@
             <if test="record.status != 4 and record.status != 0">
                 and a.status = #{record.status}
             </if>
+            <if test="record.memberId != null">
+                and a.member_id=#{record.memberId}
+            </if>
         </where>
         order by a.created_time desc
     </select>

--
Gitblit v1.9.1