总后台-项目会员管理

fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -140,8 +140,21 @@ public class FsUserController extends BaseController
     {
         startPage();
         List<FsUserVO> list = fsUserService.selectFsUserVOListByProject(fsUser);
-        for (FsUserVO vo : list){
-            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
+        boolean checkPhone = isCheckPhone();
+        for (FsUserVO fsUserVO : list) {
+            if(fsUserVO.getPhone() != null&&fsUserVO.getPhone()!=""){
+                if (!checkPhone){
+                    if (fsUserVO.getPhone().length()>11){
+                        fsUserVO.setPhone(decryptPhoneMk(fsUserVO.getPhone()));
+                    }else {
+                        fsUserVO.setPhone(fsUserVO.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                    }
+                } else {
+                    if (fsUserVO.getPhone().length()>11) {
+                        fsUserVO.setPhone(decryptPhone(fsUserVO.getPhone()));
+                    }
+                }
+            }
         }
         return getDataTable(list);
     }

fs-service/src/main/java/com/fs/his/vo/FsUserVO.java

@@ -161,4 +161,8 @@ public class FsUserVO extends FsUser implements Serializable
 
     @ApiModelProperty(value = "销售用户关联id")
     private Long companyUserId;
+
+    @ApiModelProperty(value = "绑定时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date bindTime;
 }

fs-service/src/main/resources/db/20250822-项目会员状态.sql

@@ -0,0 +1,12 @@
+-- 字典
+INSERT INTO `sys_dict_type`
+(`dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES
+    ('项目会员状态', 'project_user_status', '0', 'admin', '2021-11-24 23:26:40', '', NULL, '项目会员状态');
+
+INSERT INTO `sys_dict_data`
+(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+VALUES
+    (1, '小黑屋', '0', 'project_user_status', '', '', 'Y', '0', 'admin', '2021-11-24 23:26:40', '', NULL, '小黑屋'),
+    (2, '正常', '1', 'project_user_status', '', '', 'Y', '0', 'admin', '2021-11-24 23:26:40', '', NULL, '正常'),
+    (3, '拉黑', '2', 'project_user_status', '', '', 'Y', '0', 'admin', '2021-11-24 23:26:40', '', NULL, '拉黑');

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -1619,11 +1619,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsUserVOListByProject" resultType="com.fs.his.vo.FsUserVO">
         SELECT distinct
         b.total_amount,b.last_buy_time,p.pay_money as number,p.payment_id,p.pay_time,
-        u.*,
+        u.user_id, u.nick_name, u.avatar, u.phone, u.integral, u.now_money,
         fcc.watch_course_count, fcc.part_course_count, company_user.nick_name AS companyUserNickName, fcc.last_watch_date
         ,company.company_name,
         ucu.project_id,
-        ucu.id as companyUserId
+        ucu.id as companyUserId,
+        ucu.create_time as bindTime,
+        ucu.status
         FROM
         fs_user u
         LEFT JOIN (
@@ -1648,7 +1650,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_user_course_count
         GROUP BY fs_user_course_count.user_id
         ) fcc ON fcc.user_id = u.user_id
-        left join fs_user_company_user ucu on ucu.user_id = u.user_id
+        inner join fs_user_company_user ucu on ucu.user_id = u.user_id
         LEFT JOIN company_user ON company_user.user_id = ucu.company_user_id
         LEFT JOIN company on company.company_id = company_user.company_id
         <where>
@@ -1663,15 +1665,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND u.phone LIKE CONCAT("%",#{maps.phone},"%")
             </if >
             <if test = "maps.startCreateTime != null and maps.endCreateTime != null" >
-                AND (DATE_FORMAT( u.create_time, "%Y-%m-%d" ) &gt;= DATE_FORMAT(#{maps.startCreateTime}, "%Y-%m-%d")
-                and DATE_FORMAT( u.create_time, "%Y-%m-%d" ) &lt;= DATE_FORMAT(#{maps.endCreateTime}, "%Y-%m-%d")
+                AND (DATE_FORMAT( ucu.create_time, "%Y-%m-%d" ) &gt;= DATE_FORMAT(#{maps.startCreateTime}, "%Y-%m-%d")
+                and DATE_FORMAT( ucu.create_time, "%Y-%m-%d" ) &lt;= DATE_FORMAT(#{maps.endCreateTime}, "%Y-%m-%d")
                 )
             </if >
             <if test = "maps.registerCode != null  and  maps.registerCode !=''  " >
                 AND u.register_code = #{maps.registerCode}
             </if >
             <if test = "maps.status != null" >
-                AND u.STATUS = #{maps.status}
+                AND ucu.status = #{maps.status}
             </if >
             <if test = "maps.companyId != null and maps.companyId != '' " >
                 AND company.company_id = #{maps.companyId}