From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..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);
@@ -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,7 +1268,7 @@
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>();
}
@@ -1286,6 +1287,11 @@
}
}
+ /**
+ * 鐢ㄦ埛缁熻 锛氭�荤敤鎴枫�佹祦澶辩敤鎴锋暟閲忋�佺疮璁℃湁璐拱鐢ㄦ埛鏁�
+ * @param callback
+ * @param out
+ */
@RequestMapping(value = "countUser")
public void countUser(String callback, PrintWriter out) {
try {
--
Gitblit v1.8.0