From 5289e9842a8889f4128d95501ae80e1e93f4d6ac Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 17:35:41 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 86db645..e59fcf6 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" />
@@ -89,11 +90,14 @@
<if test="record.query != null and record.query != ''">
and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
</if>
- <if test="record.status == 4">
+ <if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4">
+ <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
@@ -115,7 +119,7 @@
b.amount
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where id=#{id}
+ where a.id=#{id}
</select>
<select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
@@ -126,4 +130,30 @@
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>
+
+ <select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
+ select * from mall_order_info where status=#{status}
+ </select>
+
+ <select id="selectCntDirectOrTeam" resultType="java.lang.Integer">
+ select IFNULL(count(1), 0) from mall_order_info a
+ inner join mall_member b on a.member_id=b.ID
+ <where>
+ a.status=4
+ <if test="type == 1">
+ and b.referrer_id=#{inviteId}
+ </if>
+ <if test="type == 2">
+ and find_in_set(#{inviteId}, b.referrer_ids)
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1