From 3758c5dec1b37a58ea2dc2123c90415349dccee3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 0e67d3c..ccde44c 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
@@ -83,9 +83,9 @@
try {
if (slotTime != null) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- endTime= sd.format(new Date());
- startTime = convertDate(slotTime, endTime);
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
@@ -113,9 +113,21 @@
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
+ Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,
+ dateType, startTime, endTime);
- todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+ if (shareMap != null) {
+ Object totalNum = shareMap.get("totalNum");
+ if (totalNum != null) {
+ todayTotal = (long) totalNum;
+ }
+
+ Object totalmoney = shareMap.get("totalmoney");
+ if (totalmoney != null) {
+ todayMoney = (BigDecimal) totalmoney;
+ }
+ }
+
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -327,8 +339,8 @@
Object totalmoney = inviteMap.get("totalmoney");
if (totalmoney != null) {
- sharemoney = (BigDecimal) totalmoney;
- inviteMoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
+ inviteMoney = (BigDecimal) totalmoney;
+ inviteMoney = inviteMoney.setScale(2, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.8.0