From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 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 cce41df..a86ec70 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
@@ -73,39 +73,59 @@
page = 1;
}
- if (state !=null && state == 0) {
- state = null;
+ if (state != null && state == 0) {
+ state = null;// 鎵�鏈夌姸鎬�
}
if (type != null && type == 0 ) {
- type = null; // 鏌ヨ鎵�鏈夌被鍨嬭鍗�
+ type = null; // 鎵�鏈夌被鍨嬭鍗�
}
try {
if (slotTime != null) {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- startTime = sd.format(new Date());
- endTime = convertDate(slotTime, startTime);
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
}
+
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,
@@ -122,15 +142,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();
@@ -140,10 +153,13 @@
data.put("helpUrl", helpUrl);
if (type != null && type == 1) {
- data.put("todayMoney", "浠婃棩棰勪及杩斿埄鎬婚 楼" + todayMoney);
+ 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);
+ data.put("todayMoney", "棰勪及鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
}
+
data.put("todayTotal", "鍏�"+ todayTotal+ "绗�");
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
@@ -315,32 +331,32 @@
* @return
* @throws Exception
*/
- public String convertDate (Integer slotTime, String startTime) throws Exception {
- String endTime = null;
+ public String convertDate (Integer slotTime, String endTime) throws Exception {
+ String startTime = null;
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- endTime = DateUtil.plusDay(3, startTime);
+ startTime = DateUtil.reduceDay(3, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- endTime = DateUtil.plusDay(7, startTime);
+ startTime = DateUtil.reduceDay(7, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- endTime = DateUtil.plusDay(15, startTime);
+ startTime = DateUtil.reduceDay(15, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- endTime = DateUtil.plusDay(30, startTime);
+ startTime = DateUtil.reduceDay(30, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- endTime = DateUtil.plusDay(3*30, startTime);
+ startTime = DateUtil.reduceDay(3*30, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- endTime = DateUtil.plusDay(6*30, startTime);
+ startTime = DateUtil.reduceDay(6*30, endTime);
break;
default:
break;
}
- return endTime;
+ return startTime;
}
}
--
Gitblit v1.8.0