|
|
@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.aop.exception.DescribeException;
|
|
|
+import com.ydtech.constants.enums.WechatOpenSystem;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.dao.*;
|
|
|
@@ -94,9 +95,9 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
private SysProportionConfigMapper sysProportionConfigMapper;
|
|
|
@Resource
|
|
|
private EsmUserReferrerMapper esmUserReferrerMapper;
|
|
|
- @Resource
|
|
|
- private WxMpService wxMpService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private Map<String, WxMpService> wxMpService;
|
|
|
|
|
|
@Override
|
|
|
public List<SysPartner> queryRecommendAndPartner(String id) {
|
|
|
@@ -2119,7 +2120,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
@Override
|
|
|
public HttpResult<AAPLoginVo> loginWechat(WechatLoginVo wechatLoginVo) throws WxErrorException {
|
|
|
AAPLoginVo aapLoginVo = new AAPLoginVo();
|
|
|
- WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(wechatLoginVo.getCode());
|
|
|
+ WxOAuth2AccessToken accessToken = wxMpService.get(WechatOpenSystem.HHR.getCode()).getOAuth2Service().getAccessToken(wechatLoginVo.getCode());
|
|
|
String openId = accessToken.getOpenId();
|
|
|
SysUser sysUser = sysUserService.lambdaQuery()
|
|
|
.eq(SysUser::getOpenid, openId)
|
|
|
@@ -2153,7 +2154,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
|
|
|
@Override
|
|
|
public HttpResult<Object> bindWechat(WechatBindVo wechatBindVo, String userId) throws WxErrorException {
|
|
|
- WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(wechatBindVo.getCode());
|
|
|
+ WxOAuth2AccessToken accessToken = wxMpService.get(WechatOpenSystem.HHR.getCode()).getOAuth2Service().getAccessToken(wechatBindVo.getCode());
|
|
|
String openId = accessToken.getOpenId();
|
|
|
|
|
|
SysUser sysUser = sysUserService.lambdaQuery().eq(SysUser::getOpenid, openId).one();
|