submit

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

@@ -29,7 +29,9 @@ import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
 import com.zhongzheng.modules.distribution.vo.SellerOrderVo;
+import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysRoleService;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.top.distribution.bo.DistributionSellerQuery;
 import com.zhongzheng.modules.user.domain.User;
@@ -73,6 +75,9 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
     @Autowired
     private IDistributionActivityService iDistributionActivityService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean registerSeller(SellerAppRegisterBo bo) {
@@ -99,16 +104,16 @@ public class DistributionSellerServiceImpl extends ServiceImpl<DistributionSelle
         if(!code.equals(bo.getCode())){
             throw new CustomException("验证码错误");
         }
-        SysUser seller = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getPhonenumber, bo.getTel()).last("limit 1"));
+        SysUser seller = iSysUserService.getOneByTenant(bo.getTel());
         if(Validator.isNotNull(seller)){
-            throw new CustomException("该手机号已注册");
+            SysTenant tenant = iSysTenantService.getById(seller.getTenantId());
+            throw new CustomException(String.format("该手机号已在【%s】注册过！",tenant.getTenantName()));
         }
-        SysUser sellerIdCard = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getIdCard,EncryptHandler.encrypt(bo.getIdcard())).last("limit 1"));
+        SysUser sellerIdCard = iSysUserService.getOneIdCardByTenant(EncryptHandler.encrypt(bo.getIdcard()));
         if(Validator.isNotNull(sellerIdCard)){
             if(Validator.isNotEmpty(sellerIdCard.getSellerId())){
-                throw new CustomException("该身份证已注册业务员");
+                SysTenant tenant = iSysTenantService.getById(seller.getTenantId());
+                throw new CustomException(String.format("该身份证已在【%s】已注册业务员！",tenant.getTenantName()));
             }
         }
         DistributionSeller inertData = new DistributionSeller();

zhongzheng-system/src/main/java/com/zhongzheng/modules/alisms/service/impl/AliSmsServiceImpl.java

@@ -18,8 +18,9 @@ import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.alisms.vo.ResultBean;
 import com.zhongzheng.modules.base.bo.SmsAddBo;
 import com.zhongzheng.modules.base.service.ISmsService;
-import com.zhongzheng.modules.distribution.domain.DistributionSeller;
 import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.service.ISysTenantService;
 import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.user.domain.User;
 import com.zhongzheng.modules.user.service.IUserService;
@@ -70,6 +71,9 @@ public class AliSmsServiceImpl implements IAliSmsService {
     @Autowired
     private ISysUserService iSysUserService;
 
+    @Autowired
+    private ISysTenantService iSysTenantService;
+
     @Override
     public ResultBean sendSms(String tel, String param) {
         try{
@@ -254,10 +258,10 @@ public class AliSmsServiceImpl implements IAliSmsService {
         if(tel==null){
             throw new CustomException("手机号码不能为空");
         }
-        SysUser seller = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getPhonenumber,tel).last("limit 1"));
+        SysUser seller = iSysUserService.getOneByTenant(tel);
         if(Validator.isNotNull(seller)){
-            throw new CustomException("该手机号已注册");
+            SysTenant tenant = iSysTenantService.getById(seller.getTenantId());
+            throw new CustomException(String.format("该手机号已在【%s】注册过！",tenant.getTenantName()));
         }
         String code = ToolsUtils.getSmsCode();
         String key = Constants.REGISTER_SMS + tel;

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysUserMapper.java

@@ -47,4 +47,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     Integer saveSysUser(SysUser admin);
 
     List<String> getUserNameByRoleKey(@Param("roleKey") String roleKey);
+
+    @InterceptorIgnore(tenantLine = "true")
+    SysUser getOneByTenant(@Param("tel") String tel);
+
+    @InterceptorIgnore(tenantLine = "true")
+    SysUser getOneIdCardByTenant(@Param("encrypt") String encrypt);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysUserService.java

@@ -174,4 +174,8 @@ public interface ISysUserService extends IService<SysUser> {
     SysUser updateLoginTimeIp(Long userId);
 
     List<String> getUserNameByRoleKey(String roleKey2);
+
+    SysUser getOneByTenant(String tel);
+
+    SysUser getOneIdCardByTenant(String encrypt);
 }

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

@@ -14,14 +14,12 @@ import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.exam.domain.ExamBefore;
 import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.system.domain.SysUserPost;
 import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.system.mapper.*;
 import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysUserService;
-import com.zhongzheng.modules.system.mapper.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -506,4 +504,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return baseMapper.getUserNameByRoleKey(roleKey2);
     }
 
+    @Override
+    public SysUser getOneByTenant(String tel) {
+        return baseMapper.getOneByTenant(tel);
+    }
+
+    @Override
+    public SysUser getOneIdCardByTenant(String encrypt) {
+        return baseMapper.getOneIdCardByTenant(encrypt);
+    }
+
 }

zhongzheng-system/src/main/resources/mapper/modules/system/SysUserMapper.xml

@@ -182,4 +182,12 @@
         WHERE u.`status` = 1 AND r.role_key = #{roleKey}
     </select>
 
+    <select id="getOneByTenant" parameterType="java.lang.String" resultType="com.zhongzheng.common.core.domain.entity.SysUser">
+        SELECT * FROM sys_user WHERE `status` = 1 AND phonenumber = #{tel}
+    </select>
+
+    <select id="getOneIdCardByTenant" parameterType="java.lang.String" resultType="com.zhongzheng.common.core.domain.entity.SysUser">
+        SELECT * FROM sys_user WHERE `status` = 1 AND id_card = #{encrypt}
+    </select>
+
 </mapper>