From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 439 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 265 insertions(+), 174 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..8b2c409 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
@@ -32,6 +32,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.controller.admin.utils.AdminUtils;
import com.yeshi.fanli.entity.admin.UserInfoAdmin;
import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.Extract;
@@ -657,8 +658,6 @@
return;
}
- //double sumMoney = userInfoService.querySumMoney(key, userType, days, startTime, endTime);
-
long count = userInfoService.queryCount(key, userType, days, startTime, endTime);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -689,12 +688,8 @@
@RequestMapping(value = "countInfo")
public void countInfo(String callback, PrintWriter out) {
try {
- // 鎬荤敤鎴�
- long countTotal = userInfoCountService.countNewUser(null, null);
- // 浠婃棩鏂板
- long countToday = userInfoCountService.countNewUser(1, null);
- // 鏈湀鏂板
- long countMonth = userInfoCountService.countNewUser(null, 1);
+
+ JSONObject data = new JSONObject();
// 鎬绘暟-鏅�氱敤鎴�
long countNormal = userInfoCountService.countRank(0);
@@ -705,27 +700,43 @@
// 鎬绘暟-閲戠敤鎴�
long countGold = userInfoCountService.countRank(3);
- // 缁熻鎵�鏈夋�婚噾棰�
- double countTotalMoney = userInfoCountService.countAllMoney(null);
-
- // 缁熻鎵�鏈夊彲鎻愮幇閲戦
- String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
- if (minMoney == null)
- minMoney = "20";
-
- double min = Double.parseDouble(minMoney);
- double countCanAssets = userInfoCountService.countAllMoney(min);
-
- JSONObject data = new JSONObject();
- data.put("countTotal", countTotal);
- data.put("countToday", countToday);
- data.put("countMonth", countMonth);
data.put("countNormal", countNormal);
data.put("countCuprum", countCuprum);
data.put("countSilver", countSilver);
data.put("countGold", countGold);
+
+ /*
+ // 缁熻鎵�鏈夋�婚噾棰�
+ BigDecimal countTotalMoney = userInfoCountService.countAllMoney(null);
+
+ // 缁熻鎵�鏈夊彲鎻愮幇閲戦
+ String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
+ if (minMoney == null) {
+ minMoney = "20";
+ }
+ double min = Double.parseDouble(minMoney);
+ BigDecimal countCanAssets = userInfoCountService.countAllMoney(min);
data.put("countTotalMoney", countTotalMoney);
data.put("countCanAssets", countCanAssets);
+ */
+
+ // 绱鐢ㄦ埛鏁伴噺
+ long totalUser = userInfoCountService.countNewUser(null, null);
+ // 娴佸け鐢ㄦ埛鏁伴噺锛�180澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
+ long loseUser = userInfoCountService.countLoseUser(180);
+ // 绱鏈夎喘涔扮敤鎴锋暟
+ long orderUser = userInfoCountService.countHasOrderUser();
+
+ data.put("totalUser", totalUser);
+ data.put("loseUser", loseUser);
+ data.put("orderUser", orderUser);
+
+ // 浠婃棩鏂板鐢ㄦ埛鏁伴噺
+ long todayUser = userInfoCountService.countNewUser(1, null);
+ // 鏈湀鏂板鐢ㄦ埛鏁伴噺
+ long monthUser = userInfoCountService.countNewUser(null, 1);
+ data.put("todayUser", todayUser);
+ data.put("monthUser", monthUser);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1188,42 +1199,99 @@
* @param endTime 2018-12-01
* @param out
*/
- @RequestMapping(value = "getSameDayUserByChannel")
- public void getSameDayUserByChannel(String callback, String channelArray, Integer dateType,
+ @RequestMapping(value = "getNewUserCharts")
+ public void getNewUserCharts(String callback, String channelArray, Integer dateType,
String year, String startTime, String endTime, PrintWriter out) {
- validateParams(callback, channelArray, dateType,year,startTime,endTime,out);
+
+ String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
+ if (validateMsg != null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
+ return;
+ }
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
}
+ 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");
+ }
+
+
+ if (dateType == 1 && year != null) {
+ year = null; // 璁剧疆涓虹┖
+ } else if (dateType == 2) {
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+
+ } else if (dateType == 3) {
+ if (year != null)
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+ }
+
+
try {
Gson gson = new Gson();
- List<String> list = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟鏍煎紡涓嶆纭�"));
- return;
- }
+ Object objectDate = null;
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
- JSONArray array = new JSONArray();
-
- for (String channel: list) {
- JSONObject channelData = new JSONObject();
- List<Object> resultList = userActiveLogService.countSameDayByChannel(channel, dateType, year, startTime, endTime);
- if (resultList == null) {
- resultList = new ArrayList<Object>();
+ JSONArray line_list = new JSONArray();
+ for (String channel : channelList) {
+
+ List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel,
+ dateType, year, startTime, endTime);
+
+ if ("all".equalsIgnoreCase(channel)) {
+ channel = "鎬昏";
}
- channelData.put("name", channel);
- channelData.put("infos", resultList);
- array.add(channelData);
+
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", channel);
+
+ if (dateType != 3) {
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
+ } else {
+ // 骞磋鍥�
+ Map<String, Object> map = AdminUtils.yearsDataFactory(list);
+
+ if (objectDate == null) {
+ objectDate = map.get("date");
+ }
+ innerList.put("data", gson.toJson(map.get("value")));
+ }
+
+ line_list.add(innerList);
+ }
+
+
+ JSONObject data = new JSONObject();
+ if (objectDate != null) {
+ data.put("xAxis_list", gson.toJson(objectDate));
+ } else {
+ data.put("xAxis_list", gson.toJson(dateList));
}
- JSONObject data = new JSONObject();
- data.put("result_list", array);
+ data.put("line_list", line_list);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -1242,121 +1310,172 @@
* @param endTime 2018-12-01
* @param out
*/
- @RequestMapping(value = "getBuyProportion")
- public void getBuyProportion(String callback, String channelArray, Integer dateType,
- String year, String startTime, String endTime, PrintWriter out) {
+ @RequestMapping(value = "getTodayBuyRate")
+ public void getTodayBuyRate(String callback, String channelArray, Integer dateType,
+ String year, String startTime, String endTime, Integer orderNum, PrintWriter out) {
- validateParams(callback, channelArray, dateType,year,startTime,endTime,out);
+ String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
+ if (validateMsg != null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
+ return;
+ }
+
+ if (dateType == 2 && StringUtil.isNullOrEmpty(year)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇疯緭鍏ュ勾浠�"));
+ return;
+ }
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
+ }
+
+ 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");
+ }
+
+
+ if (dateType == 1 && year != null) {
+ year = null; // 璁剧疆涓虹┖
+ } else if (dateType == 2) {
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+
+ } else if (dateType == 3) {
+ if (year != null)
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
+ }
+
+
+ try {
+
+ Gson gson = new Gson();
+ Object objectDate = null;
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
+
+ JSONArray line_list = new JSONArray();
+ for (String channel : channelList) {
+
+ List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType,
+ year, startTime, endTime);
+
+ if ("all".equalsIgnoreCase(channel)) {
+ channel = "鎬昏";
+ }
+
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", channel);
+
+ if (dateType != 3) {
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
+ } else {
+ // 骞磋鍥�
+ Map<String, Object> map = AdminUtils.yearsDataFactory(list);
+
+ if (objectDate == null) {
+ objectDate = map.get("date");
+ }
+ innerList.put("data", gson.toJson(map.get("value")));
+ }
+
+ line_list.add(innerList);
+ }
+
+
+ JSONObject data = new JSONObject();
+ if (objectDate != null) {
+ data.put("xAxis_list", gson.toJson(objectDate));
+ } else {
+ data.put("xAxis_list", gson.toJson(dateList));
+ }
+
+ data.put("line_list", line_list);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+
+ }
+
+
+ /**
+ * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
+ * @param callback
+ * @param channelArray 娓犻亾鍚嶇О
+ * @param startTime
+ * @param endTime
+ * @param orderNum 璁㈠崟鏁伴噺
+ * @param out
+ */
+ @RequestMapping(value = "getWeekBuyRate")
+ public void getWeekBuyRate(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;
+ }
+
+ 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");
+ }
+
+ if (orderNum < 1) {
+ orderNum = 1;
}
try {
Gson gson = new Gson();
- List<String> list = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟鏍煎紡涓嶆纭�"));
- return;
- }
+ List<String> dateList = AdminUtils.getDateList(1, startTime, endTime, null);
- JSONArray array = new JSONArray();
-
- for (String channel: list) {
- JSONObject channelData = new JSONObject();
- List<Object> resultList = userActiveLogService.getBuyProportion(channel, dateType, year, startTime, endTime);
- if (resultList == null) {
- resultList = new ArrayList<Object>();
- }
- channelData.put("name", channel);
- channelData.put("infos", resultList);
- array.add(channelData);
- }
-
- JSONObject data = new JSONObject();
- data.put("result_list", array);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
- @RequestMapping(value = "countUser")
- public void countUser(String callback, PrintWriter out) {
- try {
- // 鎬荤敤鎴�
- long totalUser = userInfoCountService.countNewUser(null, null);
- // 娴佸け鐢ㄦ埛鏁伴噺锛�180澶╂湭浣跨敤鐧诲綍骞朵笖鏃犱换浣曡祫閲戞祦鍔ㄧ殑璐﹀彿鏁伴噺锛�
- long loseUser = userInfoCountService.countLoseUser(180);
- // 绱鏈夎喘涔扮敤鎴锋暟
- long orderUser = userInfoCountService.countHasOrderUser();
-
- JSONObject data = new JSONObject();
- data.put("totalUser", totalUser);
- data.put("loseUser", loseUser);
- data.put("orderUser", orderUser);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- e.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻寮傚父"));
- }
-
- }
-
- /**
- * 缁熻鍘嗗彶鏂板鐢ㄦ埛
- * @param callback
- * @param dateType 绫诲瀷 1鏃� 2鏈� 3骞�
- * @param year 2018
- * @param startTime 2018-12-01
- * @param endTime 2018-12-01
- * @param out
- */
- @RequestMapping(value = "getHistoryNewUser")
- public void getHistoryNewUser(String callback, Integer dateType, String year, String startTime,
- String endTime, PrintWriter out) {
-
- if (dateType == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鏄剧ず鏂瑰紡"));
- return;
- }
-
- if (dateType == 1 && (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime))) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鏃堕棿鍖洪棿"));
- return;
- }
-
- if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夌粨鏉熸棩鏈�"));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(startTime) && !StringUtil.isNullOrEmpty(endTime)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夎捣濮嬫棩鏈�"));
- return;
- }
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- try {
-
- List<Object> resultList = userInfoCountService.countNewUserByDate(dateType, year, startTime, endTime);
-
- if (resultList == null) {
- resultList = new ArrayList<Object>();
- }
+ JSONArray line_list = new JSONArray();
+ for (String channel : channelList) {
+ List<Object> list = userInfoCountService.getWeekBuyRate(channel, startTime, endTime,
+ orderNum, dateList);
+
+ if ("all".equalsIgnoreCase(channel)) {
+ channel = "鎬昏";
+ }
+
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", channel);
+ innerList.put("data", gson.toJson(list));
+ line_list.add(innerList);
+ }
+
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("xAxis_list", gson.toJson(dateList));
+ data.put("line_list", line_list);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -1365,32 +1484,4 @@
}
}
- public void validateParams(String callback, String channelArray, Integer dateType,
- String year, String startTime, String endTime, PrintWriter out) {
-
- if (StringUtil.isNullOrEmpty(channelArray)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨缁熻瀵瑰簲鍚嶇О"));
- return;
- }
-
- if (dateType == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎺掑垪鏂瑰紡"));
- return;
- }
-
- if (dateType == 1 && (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime))) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鏃堕棿鍖洪棿"));
- return;
- }
-
- if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夌粨鏉熸棩鏈�"));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(startTime) && !StringUtil.isNullOrEmpty(endTime)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夎捣濮嬫棩鏈�"));
- return;
- }
- }
}
--
Gitblit v1.8.0