From 05bfbb32f1eea70f54092ae8366b91d9f1bcf8b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 18:51:08 +0800
Subject: [PATCH] 20210924

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e3d62ce..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>
@@ -53,6 +53,7 @@
         <result column="longitude" property="longitude" />
         <result column="latitude" property="latitude" />
         <result column="remark" property="remark" />
+        <result column="del_flag" property="delFlag" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
             <id property="id" column="item_id" />
             <result property="orderId" column="order_id" />
@@ -95,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>
@@ -126,4 +130,13 @@
         where del_flag=2 and member_id=#{memberId}
         group by status
     </select>
+
+    <select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
+        select * from mall_order_info a where a.id = #{id}
+    </select>
+
+    <select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+        select * from mall_order_item where order_id = #{id}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1