From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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..0f7c2d5 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
@@ -448,20 +448,33 @@
@RequestMapping(value = "countOrderInfo")
public void countOrderInfo(String callback, Long uid, PrintWriter out) {
// 鑷喘宸插埌璐�
- long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ long selfNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, null, 1);
// 鍒嗕韩宸插埌璐�
- long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
-
+ long shareNumEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, null, 2);
// 鑷喘鏈埌璐�
- long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ long selfNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, null, 1);
// 鍒嗕韩鏈埌璐�
- long shareNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 2);
+ long shareNum = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, null, 2);
+
+
+ // 鑷喘宸插埌璐�
+ long selfAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ // 鍒嗕韩宸插埌璐�
+ long shareAccountEnd = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY, 2);
+ // 鑷喘鏈埌璐�
+ long selfAccount = hongBaoV2CountService.countMyDirectOrderByCashNotArrival(uid, Constant.VIP_ORDER_PAY, 1);
+ // 鍒嗕韩鏈埌璐�
+ long shareAccount = 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);
+ 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