Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -130,6 +131,16 @@ public class SysUser implements Serializable{
 	@ApiModelProperty(value = "邮编",required = false)
 	private String postalCode;
 
+	private String certificateType;
+
+	public String getCertificateType() {
+		return certificateType;
+	}
+
+	public void setCertificateType(String certificateType) {
+		this.certificateType = certificateType;
+	}
+
 	public Integer getServiceTag() {
 		return serviceTag;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/enums/CertificateTypeEnum.java

@@ -0,0 +1,41 @@
+package com.ym.mec.auth.api.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/1/6 0006
+ **/
+public enum CertificateTypeEnum implements BaseEnum<String, CertificateTypeEnum> {
+
+    IDENTITY("IDENTITY", "身份证"),
+    HK_MAC("HK_MAC", "港澳居民往来内地通行证"),
+    TAIWAN("TAIWAN", "台湾居民往来内地通行证"),
+    FOREIGN_PASSPORT("FOREIGN_PASSPORT", "外国护照");
+
+    private String code;
+
+    private String msg;
+
+    CertificateTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

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

@@ -32,6 +32,7 @@
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
+        <result column="certificate_type_" property="certificateType"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -67,9 +68,9 @@
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
-        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType})
     </insert>
     <insert id="insertTeacher">
         INSERT INTO teacher
@@ -151,6 +152,9 @@
             <if test="isSuperAdmin != null">
                 is_super_admin_ = #{isSuperAdmin},
             </if>
+            <if test="certificateType != null">
+                certificate_type_ = #{certificateType},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -265,11 +265,14 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     int findMusicGroupStudentNum(@Param("musicGroupId") String musicGroupId);
 
     /**
-     * 更新用户信息
+     * 更新用户证件信息
      *
      * @return
      */
-    int updateUser(@Param("id") Integer id, @Param("realName") String realName, @Param("idCardNo") String idCardNo);
+    int updateUser(@Param("id") Integer id,
+                   @Param("realName") String realName,
+                   @Param("idCardNo") String idCardNo,
+                   @Param("certificateType") String certificateType);
 
     /**
      * 获取乐团在读人数

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -34,6 +34,9 @@ public class StudentRegistration {
     @ApiModelProperty(value = "身份证号", required = false)
     private String idCardNo;
 
+    @ApiModelProperty(value = "证件类型")
+    private String certificateType;
+
     @ApiModelProperty(value = "所属乐团（对应 music_group 表id）", required = false)
     private String musicGroupId;
 
@@ -118,6 +121,14 @@ public class StudentRegistration {
     
     private Integer chargeTypeId;
 
+    public String getCertificateType() {
+        return certificateType;
+    }
+
+    public void setCertificateType(String certificateType) {
+        this.certificateType = certificateType;
+    }
+
     public BigDecimal getBalance() {
         return balance;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -8,6 +8,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -220,7 +221,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
+				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 
 		// 合成freemarker
@@ -315,7 +317,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
+				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -511,7 +514,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
+				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -654,7 +658,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
+				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -889,7 +894,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
+				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 
 		Date date = new Date();
@@ -976,7 +982,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
-		if (sysUserTsign == null) {
+		if (sysUserTsign == null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
 			try {
 				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 			} catch (Exception e) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1314,6 +1315,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional
     public StudentRegistration updateStudent(StudentRegistration studentRegistration) {
+        if(StringUtils.isBlank(studentRegistration.getCertificateType())){
+            studentRegistration.setCertificateType(CertificateTypeEnum.IDENTITY.getCode());
+        }
         StudentRegistration student = get(studentRegistration.getId());
         if (student == null) {
             throw new BizException("用户注册信息不存在，无法更新");
@@ -1321,9 +1325,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setParentsName(studentRegistration.getParentsName());
         student.setIdCardNo(studentRegistration.getIdCardNo());
         update(student);
-        studentRegistrationDao.updateUser(student.getUserId(), student.getParentsName(), student.getIdCardNo());
+        studentRegistrationDao.updateUser(student.getUserId(), student.getParentsName(), student.getIdCardNo(), studentRegistration.getCertificateType());
         // 添加用户电子签章账户
-        contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
+        if(CertificateTypeEnum.IDENTITY.getCode().equals(studentRegistration.getCertificateType())){
+            contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
+        }
         return student;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.entity.SysUserRole;
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -1569,7 +1570,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 		}
-		if(!"36".equals(user.getOrganId())){
+		if(!"36".equals(user.getOrganId())&& CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())){
 			try {
 				contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
 			} catch (Exception e) {

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -618,7 +618,7 @@
     </select>
 
     <update id="updateUser">
-        UPDATE sys_user SET real_name_ = #{realName},id_card_no_=#{idCardNo} WHERE id_=#{id}
+        UPDATE sys_user SET real_name_ = #{realName},id_card_no_=#{idCardNo},certificate_type_=#{certificateType},update_time_=NOW() WHERE id_=#{id}
     </update>
     <update id="updateCurrentClass" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
         UPDATE student_registration sr SET sr.current_grade_ = #{currentGrade},sr.current_class_ = #{currentClass},sr.current_grade_date_= NOW(),sr.update_time_ = NOW()