From 0e5e21d2f3693dc993b3f49d88a275f7b226eba5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index bc89707..d65b2e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -10,6 +10,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
import java.util.UUID;
@@ -67,6 +68,7 @@
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.UserCustomSettingsException;
+import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -92,6 +94,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@@ -113,6 +116,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
+import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
@@ -208,6 +212,9 @@
@Resource
private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
private static final String PASSWORD_MAX_ERROR = "password_max_error";
@@ -1982,12 +1989,11 @@
* 璁剧疆鐣岄潰寮�鍏崇姸鎬�
* @param acceptData
* @param uid
- * @param type 1-閫氱煡鍏嶆墦鎵�(20:00-8:00) 2-涓嶇湅娑堟伅绾㈢偣鎻愰啋 3-涓嶇湅濂栭噾缁熻 涓嶇湅閭�璇锋嬁濂栭噾 4-涓嶇湅鍒嗕韩璁板綍鍜岄�夊搧搴� 涓嶇湅娑堟伅绾㈢偣鎻愰啋
- * @param state 0鍏抽棴 1寮�鍚�
+ * @param params
* @param out
*/
@RequestMapping(value = "setModuleState", method = RequestMethod.POST)
- public void setModuleState(AcceptData acceptData, Long uid, Integer type, Integer state, PrintWriter out) {
+ public void setModuleState(AcceptData acceptData, Long uid, String params, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
@@ -1995,8 +2001,20 @@
}
try {
- userCustomSettingsService.saveModuleState(uid, type, state);
+ if (params == null || params.trim().length() == 0) {
+ out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁负绌�"));
+ return;
+ }
+
+ JSONObject json = JSONObject.fromObject(params);
+ Iterator<String> iterator = json.keys();
+ while(iterator.hasNext()){
+ String type = (String) iterator.next();
+ int state = json.getInt(type);
+ userCustomSettingsService.saveModuleState(uid, type, state);
+ }
out.print(JsonUtil.loadTrueResult("璁剧疆鎴愬姛"));
+
} catch (UserCustomSettingsException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -2005,5 +2023,40 @@
}
}
+
+ /**
+ * 鑾峰彇绛夌骇淇℃伅
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getRankInfo", method = RequestMethod.POST)
+ public void getRankInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ try {
+
+ UserInfoExtraVO rankInfo = userInfoExtraService.getRankInfo(uid);
+
+ GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+ gsonBuilder.excludeFieldsWithoutExposeAnnotation();
+ Gson gson = gsonBuilder.setDateFormat("yyyy.MM.dd").create();
+
+ JSONObject resultData = new JSONObject();
+ resultData.put("rankInfo", gson.toJson(rankInfo));
+
+ out.print(JsonUtil.loadTrueResult(resultData));
+
+ } catch (UserInfoExtraException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0