cloudroam
2024-12-12 db6da36b94e1e43096a818052ee65dbfcd5e6d98
src/main/java/com/mzl/flower/web/login/SupplierLoginController.java
@@ -5,6 +5,7 @@
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.base.cache.StringCacheClient;
import com.mzl.flower.config.GlobalSupplierVariables;
import com.mzl.flower.config.exception.BaseException;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.token.PhoneAuthenticationToken;
@@ -70,6 +71,9 @@
    @Autowired
    private SupplierSubMapper supplierSubMapper;
    @Autowired
    private GlobalSupplierVariables globalSupplierVariables;
    public static final String SMS_CODE_KEY = "SMS-CODE-KEY";
@@ -102,16 +106,19 @@
        SupplierSub supplierSub = supplierSubMapper.getCurrentSupplier(user.getId());
        if (supplierSub != null) {
            if (supplierSub.getIsEnabled() == false) {
                throw new ValidationException("子账号已禁用,请联系父级账号");
                throw new ValidationException("子账号已禁用");
            }else{
                //这里拿父级供应商ID查询用户ID再校验
                SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(String.valueOf( supplierSub.getSupplierId()));
                if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
                    throw new ValidationException("父级账号用户已禁用,请联系管理员");
                    throw new ValidationException("账号用户已禁用,请联系管理员");
                }
            }
        }else {
            SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
            if (!ObjectUtils.isEmpty(supplierDTO)) {
                globalSupplierVariables.removeSupplier(String.valueOf(supplierDTO.getId()));
            }
            if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
                throw new ValidationException("用户已禁用,请联系管理员");
            }