From 5d17f725bb5bb51108aaba4230b5a0e5789a825d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 17:27:10 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 82931b5..7675a74 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -7,7 +7,10 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,b.name memberName,b.phone memberPhone
+ select *,
+ b.name memberName,
+ b.bind_phone memberBindPhone,
+ b.phone memberPhone
from mall_order_info a
left join mall_member b on a.member_id = b.id
<where>
@@ -52,6 +55,7 @@
<result column="address" property="address" />
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
+ <result column="order_type" property="orderType" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -93,8 +97,11 @@
<if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4 and record.status != 0">
+ <if test="record.status != 4 and record.status != 0 and record.status != 5">
and a.status = #{record.status}
+ </if>
+ <if test="record.status == 5">
+ and a.status = 7
</if>
<if test="record.memberId != null">
and a.member_id=#{record.memberId}
@@ -142,4 +149,33 @@
<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 in (2,3,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>
+
+ <select id="selectCntDirect" resultType="java.lang.Integer">
+ select count(1) from (
+ select a.invite_id, count(1)
+ from mall_member a
+ inner join mall_order_info b on a.ID=b.member_id
+ where a.referrer_id=#{inviteId} and b.status in (2,3,4)
+ group by a.invite_id
+ ) a
+ </select>
+
+ <select id="selectTotalAmount" resultType="java.math.BigDecimal">
+ select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
+ where member_id=#{memberId} and status = 4
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1