用户注销

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -53,7 +53,7 @@ public class SysUser implements Serializable{
 
 	/** 0-正常，1-删除 */
 	@ApiModelProperty(value = "0-正常，1+ -删除")
-	private Integer delFlag;
+	private Boolean delFlag;
 
 	/** 微信openid */
 	@ApiModelProperty(value = "微信openid")
@@ -204,11 +204,11 @@ public class SysUser implements Serializable{
 		isSuperAdmin = superAdmin;
 	}
 
-	public Integer getDelFlag() {
+	public Boolean getDelFlag() {
 		return delFlag;
 	}
 
-	public void setDelFlag(Integer delFlag) {
+	public void setDelFlag(Boolean delFlag) {
 		this.delFlag = delFlag;
 	}
 

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/dal/dao/SysUserDao.java

@@ -167,5 +167,5 @@ public interface SysUserDao extends BaseDAO<Long, SysUser> {
                             @Param("username") String username,
                             @Param("avatar") String avatar);
 
-    Integer queryMaxVersionById(@Param("id")Long id);
+    List<SysUser> queryHistoryUserById(@Param("id")Long id);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -29,6 +29,7 @@ import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.toolset.base.exception.BizException;
+import org.springframework.util.CollectionUtils;
 
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {
@@ -252,13 +253,21 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
     @Override
     public void logoffById(Long id) {
-        Integer version = sysUserDao.queryMaxVersionById(id);
-        if(null == version){
-            version = 0;
-        }else{
-            version += 1;
+        List<SysUser> sysUsers = sysUserDao.queryHistoryUserById(id);
+        Integer maxVersion = 0;
+        if (!CollectionUtils.isEmpty(sysUsers)) {
+            for (SysUser sysUser : sysUsers) {
+                String[] split = sysUser.getPhone().split("\\+");
+                if (split.length == 2) {
+                    String version = split[0].substring(1);
+                    if (maxVersion < Integer.parseInt(version)) {
+                        maxVersion = Integer.parseInt(version);
+                    }
+                }
+            }
         }
-        sysUserDao.logoffById(id, version);
+        maxVersion += 1;
+        sysUserDao.logoffById(id, maxVersion);
     }
 
 }

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -272,7 +272,7 @@
         UPDATE im_user_friend SET friend_avatar_ = #{avatar},friend_nickname_ = #{username} WHERE friend_id_ = #{userId}
     </update>
     <update id="logoffById">
-        update sys_user set del_flag_ = ${num}, phone_ = concat('D', ${num}, '+', phone_) where id_ = ${userId}
+        update sys_user set del_flag_ = 1, phone_ = concat('D', ${num}, '+', phone_) where id_ = ${userId}
     </update>
     <select id="queryEmployeeList" resultMap="SysUser">
         select  su.*
@@ -289,8 +289,8 @@
         </where>
     </select>
 
-    <select id="queryMaxVersionById" resultType="java.lang.Integer">
-        select max(del_flag_) from sys_user
+    <select id="queryHistoryUserById" resultMap="SysUser">
+        select * from sys_user
         where phone_ like CONCAT('%',(select phone_ from sys_user where id_ = #{id} and del_flag_ = 0),'%')
     </select>
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherWithdrawalSearch.java

@@ -37,6 +37,8 @@ public class TeacherWithdrawalSearch extends QueryInfo{
 
 	@ApiModelProperty("查询时间（yyyy-MM） ")
 	private String searchDate;
+	@ApiModelProperty("APP提现状态 DOING、审核中 PASS、结算成功 UNPASS、结算失败 ")
+	private String status;
 
 	private Long userId;
 
@@ -111,4 +113,12 @@ public class TeacherWithdrawalSearch extends QueryInfo{
 	public void setVerifyUser(String verifyUser) {
 		this.verifyUser = verifyUser;
 	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ContractTemplateMapper.xml

@@ -119,7 +119,10 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPageList" resultMap="ContractTemplateDto" parameterType="map">
-		SELECT tct.*,ifnull(u.real_name_,u.username_) latest_operator_ FROM contract_template tct left join sys_user u on tct.modify_by_ = u.id_
+		SELECT
+		       tct.*,ifnull(u.real_name_,u.username_) latest_operator_
+		FROM contract_template tct
+		left join sys_user u on tct.modify_by_ = u.id_
 		<where>
 			<if test="status != null">
 				and tct.status_ = #{status}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -70,6 +70,7 @@
         left join subject as s on b.subject_id_ = s.id_
         left join sys_user as u on b.teacher_id_ = u.id_
         <where>
+            u.del_flag_ = 0
             <if test="param.teacherId != null">
                 and b.teacher_id_ = #{param.teacherId}
             </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -68,7 +68,7 @@
             gender_ as gender
         FROM employee t
         left join sys_user u on t.user_id_ = u.id_
-        where t.user_id_ = #{id}
+        where u.del_flag_ = 0 and t.user_id_ = #{id}
     </select>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.EmployeeVo">
@@ -81,6 +81,7 @@
         FROM employee t
         left join sys_user u on t.user_id_ = u.id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                 t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
@@ -115,9 +116,6 @@
     <update id="updateSysUser" parameterType="com.yonge.cooleshow.auth.api.entity.SysUser">
         UPDATE sys_user
         <set>
-            <if test="delFlag != null">
-                del_flag_ = #{delFlag},
-            </if>
             <if test="wxOpenid != null and wxOpenid != ''">
                 wx_openid_ = #{wxOpenid},
             </if>
@@ -179,7 +177,7 @@
                 certificate_type_ = #{certificateType},
             </if>
         </set>
-        WHERE id_ = #{id}
+        WHERE del_flag_ = 0 and id_ = #{id}
     </update>
 
     <insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.Employee" useGeneratedKeys="true" keyColumn="id"
@@ -251,15 +249,15 @@
     </insert>
 
     <select id="querySysUserByPhoneAndLock" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone} LIMIT 1 FOR UPDATE
+		select * from sys_user where del_flag_ = 0 and (phone_ = #{phone} OR username_ = #{phone}) LIMIT 1 FOR UPDATE
 	</select>
 
     <select id="querySysUserByPhone" resultMap="SysUser">
-		select * from sys_user where phone_ = #{phone} OR username_ = #{phone}
+		select * from sys_user where del_flag_ = 0 and (phone_ = #{phone} OR username_ = #{phone})
 	</select>
 
     <select id="querySysUserById" resultMap="SysUser">
-		select * from sys_user where id_ = #{id}
+		select * from sys_user where del_flag_ = 0 and id_ = #{id}
 	</select>
 
     <update id="updateUserDemissionDate">
@@ -294,7 +292,7 @@
     </insert>
 
     <update id="updatePasswordReq">
-        UPDATE sys_user SET password_ = #{password} WHERE id_ = #{userID}
+        UPDATE sys_user SET password_ = #{password} WHERE del_flag_ = 0 and id_ = #{userID}
     </update>
 
     <!-- 根据主键删除一条记录 -->
@@ -311,7 +309,7 @@
 
 
     <select id="getUsers" resultMap="SysUser">
-        select * from sys_user where id_ IN
+        select * from sys_user where del_flag_ = 0 and id_ IN
         <foreach collection="userIds" open="(" close=")" separator="," item="userId">
             #{userId}
         </foreach>

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -49,7 +49,7 @@
             u.user_type_ as userType
         FROM student t
         left join sys_user u on t.user_id_ = u.id_
-        where t.user_id_ = #{userId}
+        where u.del_flag_ = 0 and t.user_id_ = #{userId}
     </select>
     <select id="detailByPhone" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
         SELECT
@@ -70,7 +70,7 @@
             u.user_type_ as userType
         FROM student t
         left join sys_user u on t.user_id_ = u.id_
-        where u.phone_ = #{phone}
+        where u.del_flag_ = 0 and u.phone_ = #{phone}
     </select>
     <!-- 分页查询 -->
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.StudentVo">
@@ -89,6 +89,7 @@
         FROM student t
         left join sys_user u on t.user_id_ = u.id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                     t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentStarMapper.xml

@@ -19,13 +19,20 @@
 			t.teacher_id_ as userId,
 			count(1) as fansNum
 		from student_star t
+		left join sys_user us on t.teacher_id_ = us.id_
+		left join sys_user ut on t.student_id_ = ut.id_
+		where us.del_flag_ = 0 and ut.del_flag_ = 0
 		group by t.teacher_id_
 	</select>
+
     <select id="queryStudentTotal" resultType="com.yonge.cooleshow.biz.dal.vo.StudentTotalVo">
 		select
 			t.student_id_ as userId,
 			count(1) as starTeacherNum
 		from student_star t
+		left join sys_user us on t.teacher_id_ = us.id_
+		left join sys_user ut on t.student_id_ = ut.id_
+		where us.del_flag_ = 0 and ut.del_flag_ = 0
 		group by t.student_id_
 	</select>
 
@@ -33,6 +40,9 @@
 		select
 			<include refid="baseColumns"/>
 		from student_star t
+		left join sys_user us on t.teacher_id_ = us.id_
+		left join sys_user ut on t.student_id_ = ut.id_
+		where us.del_flag_ = 0 and ut.del_flag_ = 0
 		where t.student_id_ = #{studentId} and t.teacher_id_ = #{teacherId}
 	</select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -72,6 +72,7 @@
 
     <sql id="queryCondition">
         <where>
+            su.del_flag_ = 0
             <if test="type!=null">
                 AND ss.type_ = #{type, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}
             </if>
@@ -92,7 +93,9 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysSuggestion" parameterType="map">
-        SELECT ss.*,CASE WHEN ss.client_type_='STUDENT' THEN su.username_ ELSE su.real_name_ END username_ FROM sys_suggestion ss
+        SELECT ss.*,
+               CASE WHEN ss.client_type_='STUDENT' THEN su.username_ ELSE su.real_name_ END username_
+        FROM sys_suggestion ss
         LEFT JOIN sys_user su ON su.id_ = ss.user_id_
         <include refid="queryCondition" />
         ORDER BY ss.id_ DESC

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -52,6 +52,7 @@
         left join sys_user u on t.user_id_ = u.id_
         left join sys_user v on t.verify_user_id_ = v.id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                     t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
@@ -90,7 +91,7 @@
             ) as verifyUser
         from teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
-        where t.id_ = #{id}
+        where u.del_flag_ = 0 and t.id_ = #{id}
     </select>
     <select id="getLastRecordByUserId" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">
         select
@@ -106,7 +107,7 @@
             ) as verifyUser
         from teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
-        where t.user_id_ = #{userId}
+        where u.del_flag_ = 0 and t.user_id_ = #{userId}
 		order by t.create_time_ desc limit 1
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthMusicianRecordMapper.xml

@@ -44,7 +44,7 @@
         from teacher_auth_musician_record t
         left join teacher_auth_entry_record te on t.user_id_ = te.user_id_ and te.teacher_auth_status_ in ('DOING','PASS')
         left join sys_user u on t.user_id_ = u.id_
-        where t.id_ = #{id}
+        where u.del_flag_ = 0 and t.id_ = #{id}
     </select>
 
     <!-- 分页查询 -->
@@ -59,6 +59,7 @@
         left join sys_user u on t.user_id_ = u.id_
         left join sys_user v on t.verify_user_id_ = v.id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                 t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -65,6 +65,7 @@
             select distinct user_id_ from user_bank_card where del_flag_ = 0
         ) b on t.user_id_ = b.user_id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                 t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
@@ -96,12 +97,13 @@
 		<result property="avatar" column="avatar_"/>
 	</resultMap>
 	<select id="getBasicUserInfo" resultMap="BasicUserInfo">
-		SELECT id_ user_id_,username_,real_name_,avatar_ FROM sys_user WHERE id_ = #{userId} LIMIT 1
+		SELECT id_ user_id_,username_,real_name_,avatar_ FROM sys_user
+		WHERE del_flag_ = 0 and id_ = #{userId} LIMIT 1
 	</select>
 
 	<select id="findBasicUserInfo" resultMap="BasicUserInfo">
 		SELECT id_ user_id_,username_,real_name_,avatar_ FROM sys_user
-		WHERE id_ IN
+		WHERE del_flag_ = 0 and id_ IN
 		<foreach collection="studentIds" open="(" close=")" separator="," item="userId">
 			#{userId}
 		</foreach>
@@ -129,7 +131,7 @@
         left join (
             select distinct user_id_ from user_bank_card where del_flag_ = 0 and user_id_ = #{userId}
         ) b on t.user_id_ = b.user_id_
-        where t.user_id_ = #{userId}
+        where u.del_flag_ = 0 and t.user_id_ = #{userId}
     </select>
 
     <select id="querySubject" resultMap="com.yonge.cooleshow.biz.dal.dao.SubjectDao.Subject">
@@ -171,6 +173,6 @@
         FROM student_star s
         LEFT JOIN sys_user u ON s.student_id_ = u.id_
         LEFT JOIN student sr ON s.student_id_ = sr.user_id_
-        WHERE s.teacher_id_ =#{teacherId}
+        WHERE u.del_flag_ = 0 and s.teacher_id_ =#{teacherId}
     </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherStyleVideoMapper.xml

@@ -41,7 +41,7 @@
 		FROM teacher_style_video t
 		left join sys_user u on t.user_id_ = u.id_
 		left join sys_user v on t.verify_user_id_ = v.id_
-		where t.id_ = #{id}
+		where u.del_flag_ = 0 and t.id_ = #{id}
 	</select>
 
 	<select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo">
@@ -53,7 +53,7 @@
 		FROM teacher_style_video t
 		left join sys_user u on t.user_id_ = u.id_
 		left join sys_user v on t.verify_user_id_ = v.id_
-		where t.del_flag_ = 0
+		where t.del_flag_ = 0 and u.del_flag_ = 0
 		<if test="null != param.search and '' != param.search">
 			AND (
 			t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
@@ -81,7 +81,7 @@
 		SELECT
 			<include refid="baseColumns"/>
 		FROM teacher_style_video t
-		WHERE t.del_flag_ = '0' and t.user_id_ = #{userId}
+		WHERE t.del_flag_ = 0 and t.user_id_ = #{userId}
 	</select>
 
 	<update id="removeByUserIdAndOldIds">
@@ -105,7 +105,7 @@
 		LEFT JOIN teacher a on t.user_id_ = a.user_id_
 		LEFT JOIN sys_user u on t.user_id_ = u.id_
 		LEFT JOIN teacher_total ta on t.user_id_ = ta.user_id_
-		where t.del_flag_ = 0 and t.auth_status_ = 'PASS'
+		where t.del_flag_ = 0 and u.del_flag_ = 0 and t.auth_status_ = 'PASS'
 		<if test="param.username != null and param.username != ''">
 			AND u.username_ LIKE CONCAT('%', #{param.username}, '%')
 		</if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserBindingTeacherMapper.xml

@@ -14,21 +14,22 @@
         LEFT JOIN sys_user su ON b.student_id_=su.id_
         LEFT JOIN student s ON b.student_id_=s.user_id_
         <where>
-        <if test="param.subjectId != null">
-           AND find_in_set(#{param.subjectId},s.subject_id_)
-        </if>
-        <if test="param.teacherId !=null">
-            AND b.teacher_id_ = #{param.teacherId}
-        </if>
-        <if test="param.userName !=null and param.userName !=''">
-            AND su.username_ LIKE CONCAT('%', #{param.userName}, '%')
-        </if>
-        <if test="param.studentList !=null and param.studentList.size>0">
-            AND su.id_ IN
-            <foreach collection="param.studentList" item="item" open="(" separator="," close=")">
-                #{item.userId}
-            </foreach>
-        </if>
+            su.del_flag_ = 0
+            <if test="param.subjectId != null">
+               AND find_in_set(#{param.subjectId},s.subject_id_)
+            </if>
+            <if test="param.teacherId !=null">
+                AND b.teacher_id_ = #{param.teacherId}
+            </if>
+            <if test="param.userName !=null and param.userName !=''">
+                AND su.username_ LIKE CONCAT('%', #{param.userName}, '%')
+            </if>
+            <if test="param.studentList !=null and param.studentList.size>0">
+                AND su.id_ IN
+                <foreach collection="param.studentList" item="item" open="(" separator="," close=")">
+                    #{item.userId}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -78,6 +79,7 @@
         ) a
         left join teacher t on a.teacher_id_ = t.user_id_
         left join sys_user u on t.user_id_ = u.id_
+        where u.del_flag_ = 0
     </select>
 
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderDetailMapper.xml

@@ -97,7 +97,7 @@
         FROM user_order_detail t
         left join sys_user u on t.merch_id_ = u.id_
         left join teacher_total a on t.merch_id_ = a.user_id_
-        where t.order_no_ = #{orderNo}
+        where u.del_flag_ = 0 and t.order_no_ = #{orderNo}
     </select>
 
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -56,7 +56,7 @@
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
         left join sys_user u on t.user_id_ = u.id_
-        where t.id_ = #{id}
+        where u.del_flag_ = 0 and t.id_ = #{id}
     </select>
     <select id="detailByOrderNo" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
@@ -72,7 +72,7 @@
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
         left join sys_user u on t.user_id_ = u.id_
-        where t.order_no_ = #{param.orderNo}
+        where u.del_flag_ = 0 and t.order_no_ = #{param.orderNo}
         <if test="param.userId != null">
             and t.user_id_ = #{param.userId}
         </if>
@@ -112,6 +112,7 @@
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
         left join sys_user u on t.user_id_ = u.id_
         <where>
+            u.del_flag_ = 0
             <if test="null != param.search and '' != param.search">
                 AND (
                 t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserWithdrawalMapper.xml

@@ -91,6 +91,7 @@
         left join sys_user u on t.user_id_ = u.id_
             left join sys_user au on t.auth_user_id_ = au.id_
         <where>
+            u.del_flag_ = 0
             <if test="param.userId !=null">
                 AND t.user_id_ = #{param.userId}
             </if>
@@ -128,6 +129,16 @@
             <if test="param.endTime !=null">
                 <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
+            <if test="param.status != null and param.status == 'DOING'">
+                AND (t.auth_status_ = 'DOING' OR t.trade_status_ = 'pending')
+            </if>
+            <if test="param.status != null and param.status == 'PASS'">
+                AND t.auth_status_ = 'PASS' AND t.trade_status_ = 'succeeded'
+            </if>
+            <if test="param.status != null and param.status == 'UNPASS'">
+                AND !(t.auth_status_ = 'DOING' OR t.trade_status_ = 'pending')
+                AND !(t.auth_status_ = 'PASS' AND t.trade_status_ = 'succeeded')
+            </if>
         </where>
         order by t.create_time_ desc
     </sql>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VipCardRecordMapper.xml

@@ -80,8 +80,4 @@
         and msg_status_ in (0,1)
         order by end_time_ desc
     </select>
-    <select id="getMemberPriceByOrderDetilId"
-            resultType="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings">
-
-    </select>
 </mapper>