From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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..28d639a 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,23 +73,24 @@
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;
@@ -140,9 +141,9 @@
data.put("helpUrl", helpUrl);
if (type != null && type == 1) {
- data.put("todayMoney", "浠婃棩棰勪及杩斿埄鎬婚 楼" + todayMoney);
+ 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); // 鏈夋晥鏁伴噺
@@ -315,32 +316,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