From 9f14a435039c4159cdc015bb567adc6a3f84306f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Dec 2021 15:35:29 +0800
Subject: [PATCH] 20211216

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

diff --git a/src/main/resources/mapper/modules/VideoMemberMapper.xml b/src/main/resources/mapper/modules/VideoMemberMapper.xml
index ab5d855..f6136e3 100644
--- a/src/main/resources/mapper/modules/VideoMemberMapper.xml
+++ b/src/main/resources/mapper/modules/VideoMemberMapper.xml
@@ -14,10 +14,19 @@
         select * from video_member where account=#{account} and password=#{password}
     </select>
 
-    <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
+    <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo">
         SELECT
-            a.*
+            a.id id,
+            a.account account,
+            a.name name,
+            a.is_vip isVip,
+            a.account_type accountType,
+            a.account_status accountStatus,
+            a.created_time createdTime,
+            b.buy_time buyTime,
+            b.expire_time expireTime
         FROM video_member a
+        left join video_vip_info b on a.id = b.member_id
         <where>
             <if test="record != null" >
                 <if test="record.account!=null and record.account!=''">
@@ -39,4 +48,36 @@
         select a.* from app_version a
     </select>
 
+    <select id="selectAdminVideoVipOrderInfoVoInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo">
+        SELECT
+        a.id id,
+        a.order_no orderNo,
+        a.pay_trader_no payTraderNo,
+        a.pay_type payType,
+        a.member_id memberId,
+        a.amount amount,
+        a.goods_type goodsType,
+        a.status status,
+        a.pay_time payTime,
+               b.account account,
+               b.name name
+        FROM video_vip_order_info a
+        left join video_member b on b.id = a.member_id
+        <where>
+            <if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (b.account like concat('%',  #{record.account},'%')
+                    or b.name like concat('%', #{record.account}, '%'))
+                </if>
+                <if test="record.payType!=null">
+                    and a.pay_type = #{record.payType}
+                </if>
+                <if test="record.status!=null">
+                    and a.status = #{record.status}
+                </if>
+            </if>
+        </where>
+        order by a.CREATED_TIME desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1