From 64bd2204be459b47e008b79073a143684140ff24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:20:45 +0800
Subject: [PATCH] mapper xml文件位置移动
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 48 ++++++++++++------------------------------------
1 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index e99f721..9660ab3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import com.yeshi.fanli.util.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,7 @@
import org.yeshi.utils.encrypt.DESUtil;
import com.alipay.api.AlipayApiException;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -33,6 +35,7 @@
import com.yeshi.fanli.exception.user.AlipayAccountException;
import com.yeshi.fanli.exception.user.AlipayTransferException;
import com.yeshi.fanli.exception.user.UserAccountException;
+import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -63,17 +66,11 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
-import com.yeshi.fanli.util.RedisKeyEnum;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONObject;
+import org.yeshi.utils.entity.ProxyIP;
/**
* 璐︽埛绯荤粺
@@ -266,14 +263,6 @@
ThreadUtil.run(new Runnable() {
public void run() {
try {
- int platformType = 0;
- String platform = acceptData.getPlatform();
- if ("android".equals(platform)) {
- platformType = 1;
- } else if ("ios".equals(platform)) {
- platformType = 2;
- }
- userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
// 缁戝畾oppo,vivo鎺ㄩ��
DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
if (active != null) {
@@ -397,7 +386,7 @@
return;
}
try {
- user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
+ user = userAccountService.getUserInfoByWXUnionId(SystemInfoUtil.getSystem(acceptData), weiXinUser.getUnionid());
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e, null, "鑾峰彇鐢ㄦ埛淇℃伅鍑洪敊");
@@ -407,7 +396,7 @@
}
} else if (!StringUtil.isNullOrEmpty(tbOpenid)) {
try {
- user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
+ user = userAccountService.getUserInfoByTaoBaoOpenId(SystemInfoUtil.getSystem(acceptData), tbOpenid);
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -417,7 +406,7 @@
}
} else if (!StringUtil.isNullOrEmpty(phone)) {
try {
- user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
+ user = userAccountService.getUserInfoByPhone(SystemInfoUtil.getSystem(acceptData), phone);
} catch (UserAccountException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -957,6 +946,7 @@
userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindAlipay, account);
} catch (AlipayTransferException e1) {
+ LogHelper.error("鏀粯瀹濋獙璇佸嚭閿�:"+new Gson().toJson(e1));
if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
String msg = "绯荤粺鏈兘鎴愬姛杞处0.1鍏冿紝鎻愮幇璐﹀彿淇℃伅鏈夎锛岃鏍稿鍚庨噸鏂板～鍐欍��";
out.print(JsonUtil.loadFalseResult(1, msg));
@@ -1048,7 +1038,7 @@
data.put("totalUnGetTiChengMoney",
hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
- if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),SystemInfoUtil.getSystem(acceptData)))
data.put("showTiCheng", false);
else
data.put("showTiCheng", spreadImgCount + shareCount > 0);
@@ -1174,12 +1164,12 @@
UserInfo userInfo = null;
// 鎵嬫満鐧诲綍
if (loginType == 1) {
- userInfo = userAccountService.loginPhone(request, loginType, vcode, phone, system.getAppid());
+ userInfo = userAccountService.loginPhone(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, vcode, phone, system.getAppid());
}
// 寰俊鐧诲綍
if (loginType == 2) {
- userInfo = userAccountService.loginWinXin(request, acceptData, loginType, code, system.getAppid());
+ userInfo = userAccountService.loginWinXin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, code, system.getAppid());
}
if (userInfo == null) {
@@ -1198,20 +1188,6 @@
homeNavbarUserService.synchroDeviceToUser(uuser.getId(), device);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
- }
-
- /* 鍚屾鏈櫥褰曚箣鍓嶈澶囨娊濂栨暟鎹� */
- try {
- int platformType = 0;
- String platform = acceptData.getPlatform();
- if ("android".equals(platform)) {
- platformType = 1;
- } else if ("ios".equals(platform)) {
- platformType = 2;
- }
- userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, device);
- } catch (Exception e) {
- e.printStackTrace();
}
// 缁戝畾oppo鎺ㄩ��
@@ -1357,5 +1333,5 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
+
}
--
Gitblit v1.8.0