开发商户端预约列表相关接口

Pu Zhibing

8 天以前 890c290afef9faca8ddaf0fea6197c3daa472141

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -14,6 +14,7 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
@@ -207,6 +208,10 @@
        {
            throw new ServiceException(userResult.getMsg());
        }
        if (401 == userResult.getCode())
        {
            throw new ServiceException("商户已被冻结,请联系管理员",401);
        }
        QwH5LoginVo userInfo = userResult.getData();
        SysUser user = userInfo.getSysUser();
        String username = user.getUserName();
@@ -233,11 +238,28 @@
            throw new ServiceException(userResult.getMsg());
        }
        ShopRelUserVo shopInfo = shopResult.getData();
        if(null == shopInfo){
        if (null == shopInfo) {
            throw new ServiceException("未查询到商户信息");
        }
        Long shopId = shopInfo.getShopId();
        Shop shop = remoteShopService.getShop(shopId).getData();
        if (-1 == shop.getShopStatus()) {
            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已删除，请联系管理员", Constants.FROM_SHOP);
            throw new ServiceException("对应商户已删除，请联系管理员");
        }
        if (0 == shop.getShopStatus()) {
            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已冻结，请联系管理员", Constants.FROM_SHOP);
            throw new ServiceException("对应商户已冻结，请联系管理员");
        }
        if (2 == shop.getShopStatus()) {
            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对应商户已终止合作，请联系管理员", Constants.FROM_SHOP);
            throw new ServiceException("对应商户已终止合作，请联系管理员");
        }
    
        userInfo.setShopId(shopInfo.getShopId());
        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
        userInfo.setShopName(shopInfo.getShopName());
        userInfo.setShopNum(shopInfo.getShopNum());
        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功", Constants.FROM_SHOP);
        return userInfo;
    }

@@ -280,11 +302,15 @@
        if (R.FAIL == userResult.getCode()) {
            throw new ServiceException(userResult.getMsg());
        }
//        ShopRelUserVo shopInfo = shopResult.getData();
//        if(null == shopInfo){
//            throw new ServiceException("未查询到商户信息");
//        }
//        userInfo.setShopId(shopInfo.getShopId());
        ShopRelUserVo shopInfo = shopResult.getData();
        if(null == shopInfo){
            throw new ServiceException("未查询到商户信息");
        if(null != shopInfo){
            userInfo.setShopId(shopInfo.getShopId());
        }
        userInfo.setShopId(shopInfo.getShopId());
        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功",Constants.FROM_SHOP);
        return userInfo;
    }