|
|
@@ -99,15 +99,18 @@ public class WxController {
|
|
|
public Result<YtDyzUser> iosLogin(@RequestBody IosLoginParam param, HttpServletRequest request) {
|
|
|
//根据应用ID获取配置调用接口登录
|
|
|
WxDefaultConfig defaultConfig = appUserMapper.getDefaultConfigByDitchId(param.getDitchId());
|
|
|
- if(Objects.isNull(defaultConfig)){
|
|
|
+
|
|
|
+ // 当默认配置不存在时,尝试通过渠道信息获取备用配置
|
|
|
+ if (Objects.isNull(defaultConfig)) {
|
|
|
+ // 1. 检查渠道是否存在(提前拦截无效情况)
|
|
|
YtDitch ditch = ditchMapper.selectById(param.getDitchId());
|
|
|
- if (ditch != null){
|
|
|
- WxDefaultConfig defaultConfig1 = appUserMapper.getByAppId(ditch.getAppId());
|
|
|
- if (Objects.isNull(defaultConfig1)){
|
|
|
- return new Result<>(StatusCode.ACCESS_ERR,"登录失败,未找到相应配置!");
|
|
|
- }
|
|
|
- } else {
|
|
|
- return new Result<>(StatusCode.ACCESS_ERR,"登录失败,未找到相应配置!");
|
|
|
+ if (ditch == null) {
|
|
|
+ return new Result<>(StatusCode.ACCESS_ERR, "登录失败,未找到相应配置!");
|
|
|
+ }
|
|
|
+ // 2. 通过渠道的appId获取备用配置
|
|
|
+ defaultConfig = appUserMapper.getByAppId(ditch.getAppId());
|
|
|
+ if (Objects.isNull(defaultConfig)) {
|
|
|
+ return new Result<>(StatusCode.ACCESS_ERR, "登录失败,未找到相应配置!");
|
|
|
}
|
|
|
}
|
|
|
IosUserInfo userInfo = setIosUserInfo(param);
|