From e633a09a6e03ef22314699acf4fd5d9ab42a07ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:36:41 +0800
Subject: [PATCH] 新版订单修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
index cc5a8d1..1c00043 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.alipay.api.AlipayApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -29,9 +30,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -43,19 +42,15 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
-import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.WxDownService;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -79,25 +74,16 @@
private HongBaoService hongBaoService;
@Resource
- private MoneyRecordService moneyRecordService;
-
- @Resource
private BindingAccountService bindingAccountService;
@Resource
private ExtractService extractService;
@Resource
- private PassWordErrorRecordService passWordErrorRecordService;
-
- @Resource
private ConfigService configService;
@Resource
private SystemService systemService;
-
- @Resource
- private HongBaoMessageService hongBaoMessageService;
@Resource
private ShamUserService shamUserService;
@@ -118,12 +104,7 @@
private AccountMessageService accountMessageService;
@Resource
- private CollectionGoodsService collectionGoodsService;
- @Resource
private HongBaoManageService hongBaoManageService;
-
- @Resource
- private WxDownService wxDownService;
@Resource
private UserAccountService userAccountService;
@@ -162,7 +143,7 @@
@RequestMapping(value = "login")
public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,
String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,
- PrintWriter out) {
+ HttpServletRequest request, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -185,7 +166,7 @@
tbUserInfo.setTbName(tbNickName);
tbUserInfo.setTbPic(tbPortrait);
try {
- LoginResult result = userAccountService.login(session, first, system.getAppid(), code, phone, tbUserInfo,
+ LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,
wxinstall, loginType);
if (result == null)
LogHelper.error("login-result涓虹┖鍊�");
@@ -204,6 +185,11 @@
root.put("data", data);
out.print(JsonUtil.loadTrueResult(root));
} catch (UserAccountException e) {
+ try {
+ LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
@@ -328,11 +314,35 @@
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇寰俊鐢ㄦ埛淇℃伅澶辫触"));
return;
}
- user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
+ try {
+ user = userAccountService.getUserInfoByWXUnionId(system.getAppid(), weiXinUser.getUnionid());
+ } catch (UserAccountException e) {
+ try {
+ LogHelper.errorDetailInfo(e, null, "鑾峰彇鐢ㄦ埛淇℃伅鍑洪敊");
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
} else if (!StringUtil.isNullOrEmpty(tbOpenid)) {
- user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
+ try {
+ user = userAccountService.getUserInfoByTaoBaoOpenId(system.getAppid(), tbOpenid);
+ } catch (UserAccountException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
} else if (!StringUtil.isNullOrEmpty(phone)) {
- user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
+ try {
+ user = userAccountService.getUserInfoByPhone(system.getAppid(), phone);
+ } catch (UserAccountException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
}
if (user == null) {
@@ -723,9 +733,7 @@
redisManager.removeCommonString(key);
}
}
-
-
-
+
@RequestMapping(value = "bindalipaywithverifynew")
public void bindAlipayWithVerifyNew(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {
@@ -771,7 +779,8 @@
"PERMIT_CHECK_PERM_IDENTITY_THEFT", "PERMIT_NON_BANK_LIMIT_PAYEE", "EXCEED_LIMIT_UNRN_DM_AMOUNT" };
try {
BindingAccount bindingAccount = bindingAccountService.changeAlipayBindingWithVerify(uid, name, account);
- out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount), "绯荤粺宸叉垚鍔熻浆璐�0.1鍏冨埌鎻愮幇璐﹀彿涓紝鎻愮幇璐﹀彿楠岃瘉閫氳繃锛屾伃鍠滀綘锛佸彲浠ユ彁鐜颁簡銆�"));
+ out.print(JsonUtil.loadTrue(0, JsonUtil.getGson().toJson(bindingAccount),
+ "绯荤粺宸叉垚鍔熻浆璐�0.1鍏冨埌鎻愮幇璐﹀彿涓紝鎻愮幇璐﹀彿楠岃瘉閫氳繃锛屾伃鍠滀綘锛佸彲浠ユ彁鐜颁簡銆�"));
} catch (AlipayTransferException e1) {
if (e1.getSubCode().equalsIgnoreCase("PAYEE_NOT_EXIST")) {
String msg = "绯荤粺鏈兘鎴愬姛杞处0.1鍏冿紝鎻愮幇璐﹀彿淇℃伅鏈夎锛岃鏍稿鍚庨噸鏂板～鍐欍��";
@@ -815,7 +824,6 @@
redisManager.removeCommonString(key);
}
}
-
/**
* 鑾峰彇鐢ㄦ埛璧勯噾璇︽儏
--
Gitblit v1.8.0