From 20f1758957a19bb5fec47fcc1c83818ee268676b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 14:16:07 +0800
Subject: [PATCH] 修改资金统计信息，优化H5的商品详情
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index aee302a..648d0e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -4,6 +4,7 @@
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -706,7 +707,7 @@
long countGold = userInfoCountService.countRank(3);
// 缁熻鎵�鏈夋�婚噾棰�
- double countTotalMoney = userInfoCountService.countAllMoney(null);
+ BigDecimal countTotalMoney = userInfoCountService.countAllMoney(null);
// 缁熻鎵�鏈夊彲鎻愮幇閲戦
String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
@@ -714,7 +715,7 @@
minMoney = "20";
double min = Double.parseDouble(minMoney);
- double countCanAssets = userInfoCountService.countAllMoney(min);
+ BigDecimal countCanAssets = userInfoCountService.countAllMoney(min);
JSONObject data = new JSONObject();
data.put("countTotal", countTotal);
@@ -1218,7 +1219,7 @@
resultList = new ArrayList<Object>();
}
channelData.put("name", channel);
- channelData.put("infos", resultList);
+ channelData.put("data_list", resultList);
array.add(channelData);
}
@@ -1244,7 +1245,7 @@
*/
@RequestMapping(value = "getBuyProportion")
public void getBuyProportion(String callback, String channelArray, Integer dateType,
- String year, String startTime, String endTime, PrintWriter out) {
+ String year, String startTime, String endTime, Integer orderNum, PrintWriter out) {
validateParams(callback, channelArray, dateType,year,startTime,endTime,out);
@@ -1267,12 +1268,12 @@
for (String channel: list) {
JSONObject channelData = new JSONObject();
- List<Object> resultList = userActiveLogService.getBuyProportion(channel, dateType, year, startTime, endTime);
+ List<Object> resultList = userActiveLogService.getBuyProportion(channel, dateType, year, startTime, endTime, orderNum);
if (resultList == null) {
resultList = new ArrayList<Object>();
}
channelData.put("name", channel);
- channelData.put("infos", resultList);
+ channelData.put("data_list", resultList);
array.add(channelData);
}
@@ -1286,6 +1287,78 @@
}
}
+
+ /**
+ * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
+ * @param callback
+ * @param channelArray 娓犻亾鍚嶇О
+ * @param startTime
+ * @param endTime
+ * @param orderNum 璁㈠崟鏁伴噺
+ * @param out
+ */
+ @RequestMapping(value = "getWeekProportion")
+ public void getWeekProportion(String callback, String channelArray, String startTime, String endTime,
+ Integer orderNum, PrintWriter out) {
+
+ if (StringUtil.isNullOrEmpty(startTime) || StringUtil.isNullOrEmpty(endTime)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鏃堕棿鍖洪棿"));
+ return;
+ }
+
+ try {
+
+ if (orderNum == null ) {
+ orderNum = 0;
+ }
+
+
+ List<String> channelList = null;
+ if (channelArray != null && channelArray.trim().length() > 0) {
+ Gson gson = new Gson();
+ channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+ }
+
+ if (channelList == null || channelList.size() == 0) {
+ channelList = new ArrayList<String>();
+ channelList.add("all");
+ }
+
+ JSONArray array = new JSONArray();
+ for (String channel : channelList) {
+ JSONObject channelData = new JSONObject();
+
+
+ List<Map<String, Object>> resultList = userActiveLogService.countOneWeekUserInfo(channel,
+ startTime, endTime, orderNum);
+
+ if (resultList == null) {
+ resultList = new ArrayList<Map<String, Object>>();
+ }
+
+ if ("all".equalsIgnoreCase(channel)) {
+ channel = "鎬昏";
+ }
+
+ channelData.put("name", channel);
+ channelData.put("data_list", resultList);
+ array.add(channelData);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("result_list", array);
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鐢ㄦ埛缁熻 锛氭�荤敤鎴枫�佹祦澶辩敤鎴锋暟閲忋�佺疮璁℃湁璐拱鐢ㄦ埛鏁�
+ * @param callback
+ * @param out
+ */
@RequestMapping(value = "countUser")
public void countUser(String callback, PrintWriter out) {
try {
@@ -1355,8 +1428,16 @@
resultList = new ArrayList<Object>();
}
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", "鏁伴噺");
+ innerList.put("data_list", resultList);
+
+ JSONArray outList = new JSONArray();
+ outList.add(innerList);
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("result_list", outList);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0