From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index 28d639a..c330a9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -94,19 +94,39 @@
try {
long count = 0;
+ long todayTotal = 0;
+ BigDecimal todayMoney = new BigDecimal(0.00);
+
+ // 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
orderNo, startTime, endTime, dateType);
if (list != null && list.size() > 0) {
+ // 缁熻鎬绘暟
count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo,
startTime, endTime, dateType);
}
+ // 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
+ if (needCount && page == 1) {
+ Map<String, Object> countMap = commonOrderService.countMoneyGroupOrderNoByUid(uid, type,
+ orderNo, startTime, endTime, dateType);
+ if (countMap != null) {
+ BigDecimal totalMoney = (BigDecimal) countMap.get("totalMoney");
+ if (totalMoney != null) {
+ todayMoney = totalMoney;// 褰撳墠鏌ヨ鎵�鏈夎鍗曞凡鍒拌处鎬婚噾棰�
+ }
+
+ //褰撳墠鏌ヨ鎵�鏈夊凡鍒拌处璁㈠崟鏁伴噺
+ todayTotal = (long) countMap.get("totalRow");
+ }
+ }
+
+
int totalValid = 0;
int totalProces = 0;
int totalInvite = 0;
- long todayTotal = 0;
- BigDecimal todayMoney = null;
+
// 闇�瑕佺粺璁′俊鎭�
if (needCount && page == 1) {
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -123,15 +143,8 @@
if (countOrder.get("totalInvite") != null) {
totalInvite = countOrder.get("totalInvite").intValue();
}
-
- todayTotal = commonOrderService.countOrder(uid, type, 1);
- todayMoney = commonOrderService.countOrderMoney(uid, type , 1);
}
- if (todayMoney == null) {
- todayMoney = new BigDecimal(0);
- }
-
String helpUrl = configService.get("order_list_help");
JSONObject data = new JSONObject();
@@ -141,10 +154,13 @@
data.put("helpUrl", helpUrl);
if (type != null && type == 1) {
- data.put("todayMoney", "浠婃棩棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("todayMoney", "棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ } else if (type != null &&(type == 2 || type == 3)) {
+ data.put("todayMoney", "棰勪及濂栭噾鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
} else {
- data.put("todayMoney", "浠婃棩棰勪及濂栭噾鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("todayMoney", "棰勪及鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
}
+
data.put("todayTotal", "鍏�"+ todayTotal+ "绗�");
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
@@ -291,10 +307,13 @@
JSONObject data = new JSONObject();
// 鍒嗕韩缁熻
BigDecimal sharemoney = commonOrderService.countOrderMoney(uid,2, dateType);
+
data.put("shareCount", commonOrderService.countOrder(uid, 2, dateType));
data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+
// 閭�璇风粺璁�
BigDecimal inviteMoney = commonOrderService.countOrderMoney(uid,3, dateType);
+
data.put("inviteCount", commonOrderService.countOrder(uid, 3, dateType));
data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
--
Gitblit v1.8.0