From ce1fba3d0a107bd6ea79b3ad9ae47c63f57a0a13 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 20:12:18 +0800
Subject: [PATCH] 20210927

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

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index e3d62ce..e6d38f4 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" />
@@ -92,8 +93,14 @@
             <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}
             </if>
         </where>
         order by a.created_time desc
@@ -126,4 +133,40 @@
         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 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 a.status in (2,3,4)
+        group by a.invite_id
+         ) a
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1