From c9cbad5f5d18c6b2ac5a063e41007933d7028329 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 七月 2020 15:24:17 +0800
Subject: [PATCH] 返利配置文件加入系统区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index b29eca8..581e3bd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -8,13 +8,13 @@
import javax.servlet.http.HttpSession;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.util.*;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.SystemUtil;
import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.entity.ProxyIP;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -22,7 +22,6 @@
import com.google.gson.Gson;
import com.qcloud.cos.model.COSObjectSummary;
import com.qcloud.cos.model.ObjectListing;
-import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -797,7 +796,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public UserInfo loginPhone(ProxyIP ipInfo, AcceptData acceptData, int loginType, String vcode, String phone, String appId)
+ public UserInfo loginPhone(ProxyIP ipInfo, int loginType, String vcode, String phone, BusinessSystem businessSystem)
throws UserAccountException {
// 绌洪娓呯悊
@@ -826,7 +825,7 @@
}
JSONObject logInfo = new JSONObject();
- logInfo.put("appId", appId);
+ logInfo.put("appId", businessSystem.getAppid());
logInfo.put("phone", phone);
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
@@ -859,19 +858,18 @@
} else {
// 鏌ヨ鏄惁瀛樺湪璇ョ數璇濆巻鍙茬敤鎴�
- UserInfo userInfo = userInfoService.getEffectiveUserInfoByPhone(phone, SystemInfoUtil.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
+ UserInfo userInfo = userInfoService.getEffectiveUserInfoByPhone(phone, businessSystem.getSystem());
if (userInfo != null) {
// 鏇存柊璐︽埛鐧诲綍淇℃伅
updateLonginInfo(userInfo, loginType, ipInfo);
} else {
userInfo = new UserInfo();
- userInfo.setAppId(appId);
- // userInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
+ userInfo.setAppId(businessSystem.getAppid());
userInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
userInfo.setPhone(phone);
userInfo.setLoginType(loginType);
userInfo.setState(UserInfo.STATE_NORMAL);
- userInfo.setSystem(SystemInfoUtil.getSystem(acceptData));
+ userInfo.setSystem( businessSystem.getSystem());
// 鍒涘缓鐢ㄦ埛
addUser(userInfo);
@@ -981,18 +979,17 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public UserInfo loginWinXin(ProxyIP ipInfo, AcceptData acceptData, int loginType, String code,
- String appId) throws UserAccountException {
+ public UserInfo loginWeiXin(ProxyIP ipInfo, int loginType, String code,
+ BusinessSystem businessSystem) throws UserAccountException {
// 鏃ュ織淇℃伅
JSONObject logInfo = new JSONObject();
- logInfo.put("appId", appId);
+ logInfo.put("appId", businessSystem.getAppid());
logInfo.put("code", code);
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
// 閫氳繃Code鎹㈠彇淇℃伅
- WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code,businessSystem.getWxAppId(), businessSystem.getWxAppSecret());
if (weiXinUser == null) {
throw new UserAccountException(1, "寰俊甯愬彿鎺堟潈澶辫触");
}
@@ -1018,7 +1015,7 @@
if (exec == null || exec.size() == 0) {
throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
} else {
- UserInfo userInfo = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(), SystemInfoUtil.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
+ UserInfo userInfo = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(),businessSystem.getSystem());
// 鐩存帴鐢ㄧ殑寰俊鐧诲綍
if (userInfo != null) {
LogHelper.test("寰俊unionID瀛樺湪:" + weiXinUser.getUnionid());
@@ -1049,7 +1046,7 @@
// 鍒涘缓鏂拌处鎴�
userInfo = new UserInfo();
userInfo.setPortrait(portrait);
- userInfo.setAppId(appId);
+ userInfo.setAppId(businessSystem.getAppid());
userInfo.setNickName(weiXinUser.getNickname());
userInfo.setWxName(weiXinUser.getNickname());
userInfo.setWxOpenId(weiXinUser.getOpenid());
@@ -1059,7 +1056,7 @@
userInfo.setLoginType(loginType);
userInfo.setLastLoginIp(ipInfo.getIp());
userInfo.setState(UserInfo.STATE_NORMAL);
- userInfo.setSystem(SystemInfoUtil.getSystem(acceptData));
+ userInfo.setSystem(businessSystem.getSystem());
addUser(userInfo);
try {
@@ -1086,18 +1083,17 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public UserInfo loginWeiXinNew(ProxyIP ipInfo, AcceptData acceptData, int loginType, String wxCode,
- String appId) throws UserAccountException {
+ public UserInfo loginWeiXinNew(ProxyIP ipInfo, int loginType, String wxCode,
+ BusinessSystem businessSystem) throws UserAccountException {
// 鏃ュ織淇℃伅
JSONObject logInfo = new JSONObject();
- logInfo.put("appId", appId);
+ logInfo.put("appId", businessSystem.getAppid());
logInfo.put("wxCode", wxCode);
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
// 閫氳繃Code鎹㈠彇淇℃伅
- WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(wxCode, wxAccount.getAppId(), wxAccount.getAppSecret());
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(wxCode, businessSystem.getWxAppId(),businessSystem.getWxAppSecret());
if (weiXinUser == null) {
throw new UserAccountException(1, "寰俊甯愬彿鎺堟潈澶辫触");
}
@@ -1110,7 +1106,7 @@
throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);
}
- UserInfo userInfo = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(), SystemInfoUtil.getSystem(acceptData));
+ UserInfo userInfo = userInfoService.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid(), businessSystem.getSystem());
if (userInfo == null) {
String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey,
StringUtil.Md5("WXLogin:" + weiXinUser.getUnionid()));
--
Gitblit v1.8.0