From bbe56bf9f6e66b3c1d0085838a6c16b76b0924f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 01 Oct 2021 20:36:58 +0800
Subject: [PATCH] add reset pwd

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e59fcf6..116f9ab 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>
@@ -93,8 +96,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}
@@ -147,7 +153,7 @@
         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
+            a.status in (2,3,4)
             <if test="type == 1">
                 and b.referrer_id=#{inviteId}
             </if>
@@ -156,4 +162,14 @@
             </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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1