feature:团客登记

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtUserAccountController.java

@@ -15,7 +15,7 @@ import org.dromara.backstage.cardCenter.service.IPtCardService;
 import org.dromara.backstage.payment.domain.bo.PtBagBo;
 import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
 import org.dromara.backstage.payment.domain.vo.PtBagVo;
-import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
+import org.dromara.backstage.payment.domain.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountInfoVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.backstage.payment.service.IPtBagService;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/vo/PtUserAccount4SelectVo.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/PtUserAccount4SelectVo.java

@@ -1,10 +1,12 @@
-package org.dromara.backstage.payment.domain.vo;
+package org.dromara.backstage.payment.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.backstage.payment.domain.PtUserAccount;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.common.sensitive.annotation.Sensitive;
@@ -103,6 +105,7 @@ public class PtUserAccount4SelectVo implements Serializable {
      */
 //    @Sensitive(strategy= SensitiveStrategy.PHONE)
     @ExcelProperty(value = "手机号码")
+    @EncryptField(algorithm = AlgorithmType.BASE64)
     private String phone;
 
     /**

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/mapper/PtUserAccountMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.backstage.domain.vo.yc.YcTraineeVo;
 import org.dromara.backstage.payment.domain.PtUserAccount;
 import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
-import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
+import org.dromara.backstage.payment.domain.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/IPtUserAccountService.java

@@ -1,7 +1,7 @@
 package org.dromara.backstage.payment.service;
 
 import org.dromara.backstage.domain.vo.yc.YcTraineeVo;
-import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
+import org.dromara.backstage.payment.domain.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
 import org.dromara.common.core.domain.R;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.backstage.payment.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjUtil;
@@ -22,13 +21,12 @@ import org.dromara.backstage.cardCenter.service.IPtCardService;
 import org.dromara.backstage.domain.vo.yc.YcTraineeVo;
 import org.dromara.backstage.payment.domain.PtUserAccount;
 import org.dromara.backstage.payment.domain.bo.PtUserAccountBo;
-import org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo;
+import org.dromara.backstage.payment.domain.PtUserAccount4SelectVo;
 import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
 import org.dromara.backstage.payment.mapper.PtUserAccountMapper;
 import org.dromara.backstage.payment.service.IPtBagService;
 import org.dromara.backstage.payment.service.IPtUserAccountService;
 import org.dromara.common.core.constant.CacheNames;
-import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PtUserAccountMapper.xml

@@ -46,9 +46,9 @@
         <result property="userType" column="user_type"/>
     </resultMap>
 
-    <select id="customPageList" resultType="org.dromara.backstage.payment.domain.vo.PtUserAccount4SelectVo">
+    <select id="customPageList" resultType="org.dromara.backstage.payment.domain.PtUserAccount4SelectVo">
         select u.user_name,u.user_id,u.dept_id,u.real_name,u.user_numb,u.phone
-        ,u.photo,u.account_status,u.freeze_status,u.status,a.dept_name deptName
+        ,u.photo,u.account_status,u.freeze_status,u.status,a.dept_name deptName,u.id_number as idNumber,u.sex
         from t_pt_userAccount u
         join t_sys_dept a on u.dept_id = a.dept_id
         <where>