submit

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -944,7 +944,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(phoneBo.getTelphone())){
             throw new CustomException("账号不能为空");
         }
-        User user = baseMapper.queryUserByTelphoneTenant(phoneBo.getTelphone(), phoneBo.getTenantId());
+        User user;
+        if (StringUtils.isNotBlank(phoneBo.getIdNum())){
+            //身份证登入
+            user = baseMapper.queryUserByIdNumTenant(phoneBo.getIdNum(), phoneBo.getTenantId());
+        }else {
+            user = baseMapper.queryUserByTelphoneTenant(phoneBo.getTelphone(), phoneBo.getTenantId());
+        }
+
         if(Validator.isEmpty(user)){
             throw new CustomException("该账号不存在");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsStudyUrlBo.java

@@ -21,6 +21,10 @@ public class GoodsStudyUrlBo implements Serializable {
     @NotBlank(message = "用户手机号码不能为空")
     private String telphone;
 
+    @ApiModelProperty("用户身份证号码")
+    @NotBlank(message = "用户身份证号码不能为空")
+    private String idNum;
+
     @ApiModelProperty("当前时间戳")
     @NotBlank(message = "当前时间戳不能为空")
     private Long stamp;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -1296,6 +1296,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         UserPhoneBo phoneBo = new UserPhoneBo();
         phoneBo.setTelphone(user.getTelphone());
         phoneBo.setTenantId(bo.getTenantId());
+        phoneBo.setIdNum(bo.getIdNum());
         log.info(String.format("旧系统获取商品学习中心路径:%s(url),%s(tenantId)",url,bo.getTenantId()));
         //缓存用户手机号码 30分钟失效
         redisCache.setCacheObjectTenant(bo.getTenantId()+":"+nowTime, JSONObject.toJSONString(phoneBo), 30, TimeUnit.MINUTES);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserPhoneBo.java

@@ -13,5 +13,7 @@ public class UserPhoneBo implements Serializable {
 
     private String telphone;
 
+    private String idNum;
+
     private Long tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -52,4 +52,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<User> getUserByTelNotTenant(@Param("telphone")String telphone);
+
+    @InterceptorIgnore(tenantLine = "true")
+    User queryUserByIdNumTenant(@Param("idNum") String idNum,@Param("tenantId")  Long tenantId);
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -437,4 +437,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             telphone = #{telphone} AND status = 1
     </select>
 
+    <select id="queryUserByIdNumTenant" parameterType="map" resultMap="UserResult">
+        SELECT
+            *
+        FROM
+            `user`
+        WHERE
+            id_card = #{idNum}
+          AND status = 1 AND tenant_id = #{tenantId}
+    </select>
+
 </mapper>