From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 194 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 169 insertions(+), 25 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 a9db663..7c1f698 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);
@@ -1191,30 +1192,8 @@
@RequestMapping(value = "getSameDayUserByChannel")
public void getSameDayUserByChannel(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;
- }
+ validateParams(callback, channelArray, dateType,year,startTime,endTime,out);
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
@@ -1252,7 +1231,172 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
+ }
+
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻褰撴棩鏂板鐢ㄦ埛鏁伴噺
+ * @param channelArray 鍚嶅瓧鏁扮粍
+ * @param dateType 绫诲瀷 1鏃� 2鏈� 3骞�
+ * @param year 2018
+ * @param startTime 2018-12-01
+ * @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, Integer orderNum, PrintWriter out) {
+
+ validateParams(callback, channelArray, dateType,year,startTime,endTime,out);
+
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ startTime = 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;
+ }
+
+ JSONArray array = new JSONArray();
+
+ for (String channel: list) {
+ JSONObject channelData = new JSONObject();
+ 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);
+ 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();
+ }
+ }
+
+ /**
+ * 鐢ㄦ埛缁熻 锛氭�荤敤鎴枫�佹祦澶辩敤鎴锋暟閲忋�佺疮璁℃湁璐拱鐢ㄦ埛鏁�
+ * @param callback
+ * @param out
+ */
+ @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>();
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("result_list", resultList);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+ 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