From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 c988e76..4be4283 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
@@ -91,6 +91,9 @@
e.printStackTrace();
}
+ if (endTime != null && endTime.trim().length() > 0) {
+ endTime += " 23:59:59";
+ }
try {
long count = 0;
@@ -99,6 +102,7 @@
int totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
@@ -360,22 +364,22 @@
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- startTime = DateUtil.reduceDay(3, endTime);
+ startTime = DateUtil.reduceDay(2, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- startTime = DateUtil.reduceDay(7, endTime);
+ startTime = DateUtil.reduceDay(6, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- startTime = DateUtil.reduceDay(15, endTime);
+ startTime = DateUtil.reduceDay(14, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- startTime = DateUtil.reduceDay(30, endTime);
+ startTime = DateUtil.reduceDay(29, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- startTime = DateUtil.reduceDay(3*30, endTime);
+ startTime = DateUtil.reduceDay(3*30-1, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- startTime = DateUtil.reduceDay(6*30, endTime);
+ startTime = DateUtil.reduceDay(6*30-1, endTime);
break;
default:
break;
--
Gitblit v1.8.0