From f0afca8e5611e46557f69cd22850c630388d329f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Dec 2021 14:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/resources/mapper/modules/VideoMemberMapper.xml | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/modules/VideoMemberMapper.xml b/src/main/resources/mapper/modules/VideoMemberMapper.xml
index 680b90c..fd87314 100644
--- a/src/main/resources/mapper/modules/VideoMemberMapper.xml
+++ b/src/main/resources/mapper/modules/VideoMemberMapper.xml
@@ -14,31 +14,38 @@
select * from video_member where account=#{account} and password=#{password}
</select>
- <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
- SELECT a.*
+ <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo">
+ SELECT
+ 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.name!=null and record.name!=''">
- and m.name like concat('%', #{record.name},'%')
- </if>
<if test="record.account!=null and record.account!=''">
- and (
- m.phone like concat('%', #{record.account},'%')
- or m.email like concat('%', #{record.account},'%')
- or m.bind_phone like concat('%', #{record.account},'%')
- or m.invite_id like concat('%', #{record.account},'%')
- )
+ and (a.account like concat('%', #{record.account},'%')
+ or a.name like concat('%', #{record.account}, '%'))
</if>
- <if test="record.accountStatus!=null">
- and m.account_status = #{record.accountStatus}
+ <if test="record.isVip!=null">
+ and a.is_vip = #{record.isVip}
</if>
- <if test="record.accountType != null" >
- and m.account_type = #{record.accountType}
+ <if test="record.accountStatus != null" >
+ and a.account_status = #{record.accountStatus}
</if>
</if>
</where>
- order by m.CREATED_TIME desc
+ order by a.CREATED_TIME desc
+ </select>
+
+ <select id="getAppVersionListInPage" resultType="cc.mrbird.febs.video.entity.AppVersion">
+ select a.* from app_version a
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1