商城商户登录添加判断

pz-system/src/main/java/com/pz/system/service/SysLoginService.java

@@ -36,6 +36,8 @@ import com.pz.merchant.domain.WechatUserInfo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
 import com.pz.merchant.domain.bo.WechatLoginBo;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.mapper.CompanyMapper;
 import com.pz.merchant.service.ICompanyService;
 import com.pz.merchant.service.ICompanyService;
+import com.pz.system.domain.StoreApply;
+import com.pz.system.mapper.StoreApplyMapper;
 import com.pz.system.mapper.SysUserMapper;
 import com.pz.system.mapper.SysUserMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -66,6 +68,7 @@ public class SysLoginService {
     private final SysPermissionService permissionService;
     private final SysPermissionService permissionService;
     private final CompanyMapper companyMapper;
     private final CompanyMapper companyMapper;
     private final ISysRoleService iSysRoleService;
     private final ISysRoleService iSysRoleService;
+    private final StoreApplyMapper storeApplyMapper;
 
 
     @Value("${user.password.maxRetryCount}")
     @Value("${user.password.maxRetryCount}")
     private Integer maxRetryCount;
     private Integer maxRetryCount;
@@ -99,6 +102,13 @@ public class SysLoginService {
                     .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
                     .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
             }
             }
         });
         });
+        Optional.ofNullable(role).ifPresent(sysRoles -> {
+            user.setRoleId(role.getRoleId());
+            if (role.getRoleId().equals(5)) {
+                Optional.ofNullable(storeApplyMapper.selectOne(Wrappers.<StoreApply>lambdaQuery().eq(StoreApply::getUid, user.getUserId()).eq(StoreApply::getStatus, 1)))
+                    .orElseThrow(() -> new ServiceException("审核暂未通过，请等待！"));
+            }
+        });
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         LoginUser loginUser = buildLoginUser(user);
         LoginUser loginUser = buildLoginUser(user);
         // 生成token
         // 生成token