From f7410364109ebb426a5e0184683a10fb1efdd0a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:59:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/resources/mapper/modules/VideoMemberMapper.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/VideoMemberMapper.xml b/src/main/resources/mapper/modules/VideoMemberMapper.xml
index a77d55a..fd87314 100644
--- a/src/main/resources/mapper/modules/VideoMemberMapper.xml
+++ b/src/main/resources/mapper/modules/VideoMemberMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="cc.mrbird.febs.video.mapper.VideoMemberMapper">
<select id="selectInfoByAccount" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
- select * from video_member where phone=#{account} or email=#{account} or invite_id=#{account}
+ select * from video_member where account=#{account} or invite_id=#{account}
</select>
<select id="selectInfoByInviteId" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
@@ -11,7 +11,41 @@
</select>
<select id="selectInfoByAccountAndPwd" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
- select * from video_member where (phone=#{account} or email=#{account}) and password=#{password}
+ select * from video_member where account=#{account} and password=#{password}
+ </select>
+
+ <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.account!=null and record.account!=''">
+ and (a.account like concat('%', #{record.account},'%')
+ or a.name like concat('%', #{record.account}, '%'))
+ </if>
+ <if test="record.isVip!=null">
+ and a.is_vip = #{record.isVip}
+ </if>
+ <if test="record.accountStatus != null" >
+ and a.account_status = #{record.accountStatus}
+ </if>
+ </if>
+ </where>
+ 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