From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 63 ++++++++++++-------------------
1 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index 147dba8..5680022 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -364,16 +364,33 @@
Map<String, Object> totalcount = extractCountService.getTodayCount();
- BigDecimal totalmoney = extractCountService.getTodayTotalSuccessMoney();
-
- totalcount.put("totalmoney", totalmoney);
-
+ // 浠婃棩鎻愮幇鎴愬姛閲戦
+ BigDecimal todayextractMoney = extractCountService.getTodayTotalSuccessMoney();
+
+ // 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
+ BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
+
+ // 鍙彁鐜伴噾棰濋檺鍒�
+ String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
+ if (minMoney == null){
+ minMoney = "0";
+ }
+ // 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
+ BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
+
+ // 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚/ 娆℃暟
Map<String, Object> resultData = extractCountService.countTotalSuccess();
-
+
+
JSONObject data = new JSONObject();
data.put("todayCount", totalcount);
- data.put("totalount", resultData);
-
+ data.put("todayextractMoney", todayextractMoney);
+
+ data.put("amountMoney", amountMoney); // 鎵�鏈夌敤鎴锋�讳綑棰�
+ data.put("extractApply", extractApply); // 鍙彁鐜伴噾棰濇�昏
+ data.put("extractNumber", resultData.get("totalamount")); // 鎻愮幇鎴愬姛娆℃暟
+ data.put("extractMoney", resultData.get("totalmoney")); // 鎻愮幇鎴愬姛閲戦
+
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
@@ -1702,37 +1719,5 @@
e.printStackTrace();
}
}
-
-
- /**
- * 缁熻璧勯噾淇℃伅
- *
- * @param out
- */
- @RequestMapping(value = "getMoneynfo")
- public void getHistoryInfo(String callback, PrintWriter out) {
-
- // 绱宸叉彁鐜伴噾棰濇�昏锛氬凡鎻愮幇鎴愬姛鐨勬�婚
- Map<String, Object> resultData = extractCountService.countTotalSuccess();
- // 褰撳墠鐢ㄦ埛浣欓鎬昏锛氭墍鏈夌敤鎴锋�讳綑棰�
- BigDecimal amountMoney = userInfoCountService.countAllMoney(null);
-
- // 鍙彁鐜伴噾棰濋檺鍒�
- String minMoney = configService.get(Constant.EXTRACT_MIN_MONEY);
- if (minMoney == null){
- minMoney = "0";
- }
- // 褰撳墠鍙彁鐜伴噾棰濇�昏锛� 瓒呰繃鏈�浣庢彁鐜伴噾棰�---璁″叆缁熻
- BigDecimal extractApply = userInfoCountService.countAllMoney(Double.parseDouble(minMoney));
-
- JSONObject data = new JSONObject();
- data.put("amountMoney", amountMoney);
- data.put("extractApply", extractApply);
- data.put("extractMoney", resultData.get("totalmoney"));
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- }
-
-
-
}
--
Gitblit v1.8.0