From a7cbabbb4c86f9778158fb3f0c3f47885963f4d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 11:19:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index cf66ff2..82931b5 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>
@@ -135,4 +139,7 @@
select * from mall_order_item where order_id = #{id}
</select>
+ <select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status=#{status}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1