From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 53562d7..b186d98 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
@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
@@ -55,6 +56,7 @@
import com.yeshi.fanli.service.inter.user.wx.WXMPUserLoginService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -62,6 +64,7 @@
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.user.UserVipRateVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller("WXMPUserAccountController")
@@ -183,8 +186,8 @@
UserInfo lastUserInfo = null;
if (!StringUtil.isNullOrEmpty(userData)) {
- String key = StringUtil.Md5("wxmp-user-login-" + acceptData.getAppId() + "-" + acceptData.getOpenId());
- String data = redisManager.getCommonString(key);
+ 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);
}
@@ -251,7 +254,8 @@
return;
}
- String key = StringUtil.Md5("wxmp-user-login-" + 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) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏁版嵁涓虹┖"));
@@ -286,7 +290,8 @@
private void printWXMPLoginResult(String appId, String openId, WXMPLoginResult result, HttpServletRequest request,
PrintWriter out) {
JSONObject data = new JSONObject();
- String key = StringUtil.Md5("wxmp-user-login-" + appId + "-" + openId);
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin, StringUtil.Md5(appId + "-" + openId));
+
switch (result.getCode()) {
case WXMPLoginResult.CODE_SUCCESS:
UserInfo user = userInfoService.selectAvailableByPrimaryKey(result.getUser().getId());
@@ -485,7 +490,7 @@
vo.setNickName(userInfo.getNickName());
vo.setPortrait(userInfo.getPortrait());
vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
- vo.setCsdLink(configService.get("customer_service_link"));
+ vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
Date now = new Date();
Date start = new Date(0);
@@ -583,11 +588,11 @@
JSONObject data = new JSONObject();
data.put("info", gson.toJson(vo));
- data.put("welfare", userVipConfigService.getValueByKey("vip_welfare"));
+ data.put("welfare",JSONArray.fromObject( userVipConfigService.getValueByKey("vip_welfare")));
if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
} else {
- out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ out.print(JsonUtil.loadTrueResult(gson.toJson(data)));
}
}
--
Gitblit v1.8.0