From c833ab8f5968c755ded82eea5e8ce2aca841a0cb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 15:14:06 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index c8e606b..c4000b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -6,6 +6,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -579,14 +580,13 @@
return detail;
}
- public static List<String> getDingDongQiangTime() {
+ public static List<String> getDingDongQiangTime(Calendar nowDate) {
// 鑾峰彇褰撳墠鐨勫皬鏃舵暟
DingDongTime[] times = new DingDongTime[] { new DingDongTime("0", "00:00"), new DingDongTime("8", "08:00"),
new DingDongTime("10", "10:00"), new DingDongTime("13", "13:00"), new DingDongTime("15", "15:00"),
new DingDongTime("17", "17:00"), new DingDongTime("19", "19:00"), new DingDongTime("20", "20:00"),
new DingDongTime("21", "21:00") };
- Calendar nowDate = Calendar.getInstance();
Calendar preDate = Calendar.getInstance();
preDate.setTimeInMillis(nowDate.getTimeInMillis() - 24 * 60 * 60 * 1000L);
@@ -601,7 +601,7 @@
? "0" + nowDate.get(Calendar.DAY_OF_MONTH) : nowDate.get(Calendar.DAY_OF_MONTH) + "";
int hour = nowDate.get(Calendar.HOUR_OF_DAY);
- int pos = 0;
+ int pos = times.length - 1;
for (int i = 0; i < times.length - 1; i++) {
if (hour >= Integer.parseInt(times[i].getKey()) && hour < Integer.parseInt(times[i + 1].getKey())) {
pos = i;
@@ -611,6 +611,7 @@
List<DingDongTime> list = new ArrayList<>();
+ //鑾峰彇褰撳墠鏃堕棿涔嬪墠鐨�5涓暟鎹�
for (int i = 5; i >= 0; i--) {
int p = pos - i < 0 ? (times.length + pos - i) : pos - i;
DingDongTime itemData = new DingDongTime(times[p].getKey(), times[p].getValue());
@@ -623,6 +624,7 @@
list.add(itemData);
}
+ //鍚戝悗娣诲姞鍓╀笅鐨�
if (pos + 1 < times.length)
for (int i = pos + 1; i < times.length; i++) {
DingDongTime itemData = new DingDongTime(times[i].getKey(), times[i].getValue());
--
Gitblit v1.8.0