From 3dedb52664dfa4101589698db52ea9cb9493efa9 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:53:53 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
index b186d98..d5a7707 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java
@@ -94,20 +94,19 @@
@Resource
private ConfigService configService;
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVipConfigService userVipConfigService;
-
+
@Resource
private BanLiShopOrderService banLiShopOrderService;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
/**
* 閫氳繃閭�璇风爜鑾峰彇鐢ㄦ埛淇℃伅
*
@@ -155,10 +154,12 @@
}
String sessionKey = null;
- WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);
+ WXMPSessionInfo sessionInfo = WXXCXUtil.getSessionInfo(Constant.WXMP_APP_INFO, code);
if (sessionInfo == null) {
out.print(JsonUtil.loadFalseResult(90000, "璇烽噸鏂扮櫥褰�"));
return;
+ } else {
+ session.setAttribute(UserController.WXMP_SESSION_INFO_KEY, sessionInfo);
}
sessionKey = sessionInfo.getSessionKey();
@@ -186,7 +187,8 @@
UserInfo lastUserInfo = null;
if (!StringUtil.isNullOrEmpty(userData)) {
- String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin, StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));
+ String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin,
+ StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));
String data = redisManager.getCommonString(redisKey);
if (!StringUtil.isNullOrEmpty(data)) {
lastUserInfo = new Gson().fromJson(data, UserInfo.class);
@@ -204,7 +206,7 @@
}
@RequestMapping("wxLogin")
- public void wxLogin(WXMPAcceptData acceptData, String wxEncryptedData, String wxIv, String inviteCode,
+ public void wxLogin(WXMPAcceptData acceptData, String wxEncryptedData, String wxIv, String inviteCode, String code,
HttpServletRequest request, HttpSession session, PrintWriter out) {
if (StringUtil.isNullOrEmpty(acceptData.getOpenId())) {
out.print(JsonUtil.loadFalseResult("openId涓虹┖"));
@@ -215,11 +217,7 @@
out.print(JsonUtil.loadFalseResult("寰俊鐢ㄦ埛鍔犲瘑鏁版嵁涓虹┖"));
return;
}
- WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);
- if (sessionInfo == null) {
- out.print(JsonUtil.loadFalseResult(90000, "璇烽噸鏂扮櫥褰�"));
- return;
- }
+ WXMPSessionInfo sessionInfo = WXXCXUtil.getSessionInfo(Constant.WXMP_APP_INFO, code);
String sessionKey = sessionInfo.getSessionKey();
if (StringUtil.isNullOrEmpty(sessionKey)) {
@@ -254,7 +252,8 @@
return;
}
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin, StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin,
+ StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));
UserInfo user = new Gson().fromJson(redisManager.getCommonString(key), UserInfo.class);
if (user == null) {
@@ -310,7 +309,7 @@
userAccountService.updateUserSelective(update);
}
});
- break;
+ return;
case WXMPLoginResult.CODE_BIND_PHONE:
// 闇�瑕佺粦瀹氱數璇濆彿鐮�
redisManager.saveObj(result.getUser(), key, 60 * 5);// 鍙紦瀛�5鍒嗛挓
@@ -334,8 +333,8 @@
out.print(JsonUtil.loadFalseResult("openId涓虹┖"));
return;
}
-
- if(uid==null){
+
+ if (uid == null) {
out.print(JsonUtil.loadFalseResult("uid涓虹┖"));
return;
}
@@ -344,7 +343,7 @@
out.print(JsonUtil.loadFalseResult("寰俊淇℃伅涓虹┖"));
return;
}
-
+
WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);
if (sessionInfo == null) {
out.print(JsonUtil.loadFalseResult(90000, "璇烽噸鏂扮櫥褰�"));
@@ -399,8 +398,7 @@
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
}
-
-
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V1.5.3
*
@@ -460,8 +458,6 @@
}
}
-
-
/**
* 鑾峰彇vip淇℃伅
*
@@ -542,15 +538,14 @@
}
vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
-
List<Integer> list = new ArrayList<Integer>();
list.add(BanLiShopOrder.STATE_SUCCESS);
BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
+ vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+ TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
-
// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
@@ -588,7 +583,7 @@
JSONObject data = new JSONObject();
data.put("info", gson.toJson(vo));
- data.put("welfare",JSONArray.fromObject( userVipConfigService.getValueByKey("vip_welfare")));
+ data.put("welfare", JSONArray.fromObject(userVipConfigService.getValueByKey("vip_welfare")));
if (!StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
} else {
@@ -623,7 +618,8 @@
list.add(BanLiShopOrder.STATE_SUCCESS);
BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
- long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
+ long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+ TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
@@ -638,7 +634,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
-
+
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null
&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
@@ -677,4 +673,13 @@
out.print(JsonUtil.loadTrueResult("宸茬敵璇�"));
}
}
+
+ @RequestMapping("logout")
+ public void logout(WXMPAcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("uid涓虹┖"));
+ return;
+ }
+ out.print(JsonUtil.loadTrueResult(""));
+ }
}
--
Gitblit v1.8.0