From 4ecb8ab87dd98bdbce6b4d591051de5d088cf907 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 17 二月 2020 10:12:24 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 3d54739..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;
@@ -63,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")
@@ -488,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);
@@ -586,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