From e26a53e729c16a36825a399f26e7ab069890320a Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 17 二月 2020 10:11:18 +0800
Subject: [PATCH] 小程序相关接口修改
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 02dc286..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
@@ -64,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")
@@ -587,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