submit

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

@@ -933,6 +933,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return baseMapper.queryUserByTelphoneTenant(telphone,tenantId);
     }
 
+    @Override
+    public User queryUserByIdNumTenant(String idNum, Long tenantId) {
+        return baseMapper.queryUserByIdNumTenant(idNum, tenantId);
+    }
+
     @Override
     public Map<String, Object> telphone_login(UserAppTelphoneLoginBo bo) {
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");

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

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

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

@@ -1146,6 +1146,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             UserPhoneBo phoneBo = new UserPhoneBo();
             phoneBo.setTelphone(bo.getTelphone());
             phoneBo.setTenantId(tenantId);
+            phoneBo.setIdNum(bo.getIdNum());
             //缓存用户手机号码 30分钟失效
             redisCache.setCacheObjectTenant(tenantId+":"+nowTime, JSONObject.toJSONString(phoneBo), 30, TimeUnit.MINUTES);
 
@@ -1245,12 +1246,19 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if (ObjectUtils.isNotNull(bo.getTenantId()) && bo.getTenantId().equals(tenantId)){
             domain = "https://web.xyyxt.net/";
             domainH5 = "https://h.xyyxt.net";
+//            domain = "http://192.168.1.222:6002/";
+//            domainH5 = "https://h.xyyxt.net";
         }
         Goods goods = baseMapper.queryGoodsByIdTenant(bo.getGoodsId(), bo.getTenantId());
         if (ObjectUtils.isNull(goods)) {
             throw new CustomException("商品不存在！");
         }
-        User user = iUserService.queryUserByTelphoneTenant(bo.getTelphone(), bo.getTenantId());
+        User user;
+        if (StringUtils.isNotBlank(bo.getIdNum())){
+            user = iUserService.queryUserByIdNumTenant(bo.getIdNum(), bo.getTenantId());
+        }else {
+            user = iUserService.queryUserByTelphoneTenant(bo.getTelphone(), bo.getTenantId());
+        }
         if (ObjectUtils.isNull(user)) {
             throw new CustomException("用户不存在！");
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -117,6 +117,8 @@ public interface IUserService extends IService<User> {
 
 	User queryUserByTelphoneTenant(String telphone,Long tenantId);
 
+	User queryUserByIdNumTenant(String idNum,Long tenantId);
+
 	Map<String, Object> telphone_login(UserAppTelphoneLoginBo bo);
 
     List<User> getUserByTelNotTenant(String telphone);