From 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 17:59:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index 26e9411..c963bf9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -447,21 +447,55 @@
@RequestMapping(value = "countOrderInfo")
public void countOrderInfo(String callback, Long uid, PrintWriter out) {
- // 鑷喘宸插埌璐�
- long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
- // 鍒嗕韩宸插埌璐�
- long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
-
- // 鑷喘鏈埌璐�
- long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
- // 鍒嗕韩鏈埌璐�
- long shareNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2);
-
JSONObject data = new JSONObject();
- data.put("selfNumEnd", selfNumEnd);
- data.put("shareNumEnd", shareNumEnd);
- data.put("selfNum", selfNum);
- data.put("shareNum", shareNum);
+
+ /* --------- 鏈湀绱 ------------*/
+ JSONObject month = new JSONObject();
+ // 鑷喘宸插埌璐�
+ month.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, 1));
+ // 鍒嗕韩宸插埌璐�
+ month.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, 1));
+ // 閭�璇峰凡鍒拌处
+ month.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, 1));
+ // 鑷喘鏈埌璐�
+ month.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, 1));
+ // 鍒嗕韩鏈埌璐�
+ month.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, 1));
+ // 閭�璇锋湭鍒拌处
+ month.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, 1));
+ data.put("month", month);
+
+
+ /* --------- 鍘嗗彶绱 ------------*/
+ JSONObject history = new JSONObject();
+ // 鑷喘宸插埌璐�
+ history.put("selfNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 1, null));
+ // 鍒嗕韩宸插埌璐�
+ history.put("shareNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 2, null));
+ // 閭�璇峰凡鍒拌处
+ history.put("inviteNumEnd", hongBaoV2CountService.countOrderByCashArrival(uid, null, 3, null));
+ // 鑷喘鏈埌璐�
+ history.put("selfNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 1, null));
+ // 鍒嗕韩鏈埌璐�
+ history.put("shareNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 2, null));
+ // 閭�璇锋湭鍒拌处
+ history.put("inviteNum", hongBaoV2CountService.countOrderByCashNotArrival(uid, null, 3, null));
+ data.put("history", history);
+
+
+ /* --------- 浠樻閲戦澶т簬1 ------------*/
+ // 鑷喘宸插埌璐�
+ long selfAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ // 鍒嗕韩宸插埌璐�
+ long shareAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
+ // 鑷喘鏈埌璐�
+ long selfAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1, null);
+ // 鍒嗕韩鏈埌璐�
+ long shareAccount = hongBaoV2CountService.countOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2, null);
+ data.put("selfAccountEnd", selfAccountEnd);
+ data.put("shareAccountEnd", shareAccountEnd);
+ data.put("selfAccount", selfAccount);
+ data.put("shareAccount", shareAccount);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0