From d7f7dfe84c9b7624d74fa9c08d3563b549317ce0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 26 一月 2019 16:04:32 +0800
Subject: [PATCH] 等级更新时间 当月1号

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 e6f5c50..c89f6a9 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
@@ -151,12 +151,13 @@
 	 * @param tbOpenid
 	 * @param tbNickName
 	 * @param tbPortrait
+	 * @param tbSession(娣樺疂session鏁版嵁,鍔犲瘑)
 	 * @param out
 	 */
 	@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,
-			HttpServletRequest request, PrintWriter out) {
+			String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,
+			HttpSession session, HttpServletRequest request, PrintWriter out) {
 		System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -453,18 +454,27 @@
 	 * @param tbOpenid
 	 * @param tbNickName
 	 * @param tbPortrait
+	 * @param tbSession
+	 *            -娣樺疂鎺堟潈session
 	 * @param out
 	 */
 
 	@RequestMapping(value = "bindTaoBao")
 	public void bindTaoBao(AcceptData acceptData, Long uid, String tbOpenid, String tbNickName, String tbPortrait,
-			PrintWriter out) {
+			String tbSession, PrintWriter out) {
 		System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
 		if (system == null) {
 			out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
 			return;
 		}
 
+		if (!StringUtil.isNullOrEmpty(tbSession)) {
+			JSONObject session = JSONObject.fromObject(tbSession);
+			tbOpenid = session.optString("openId");
+			tbNickName = session.optString("nick");
+			tbPortrait = session.optString("avatarUrl");
+		}
+
 		try {
 			userAccountService.bindTaoBao(uid, tbOpenid, tbNickName, tbPortrait);
 			UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

--
Gitblit v1.8.0