From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +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 | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 33a2b3c..9d20dc1 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
@@ -580,7 +580,7 @@
return detail;
}
- public static List<String> getDingDongQiangTime(Calendar nowDate) {
+ public static List<DingDongTime> getDingDongQiangTime(Calendar nowDate) {
// 鑾峰彇褰撳墠鐨勫皬鏃舵暟
DingDongTime[] times = new DingDongTime[] { new DingDongTime("0", "00:00"), new DingDongTime("8", "08:00"),
@@ -614,36 +614,35 @@
//鑾峰彇褰撳墠鏃堕棿涔嬪墠鐨�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());
+ DingDongTime itemData = new DingDongTime(times[p].getKey(), times[p].getValue(),-1);
if (pos - i < 0)
itemData.setTime(
preDay + "" + (itemData.getKey().length() < 2 ? ("0" + itemData.getKey()) : itemData.getKey()));
else
itemData.setTime(
nowDay + "" + (itemData.getKey().length() < 2 ? ("0" + itemData.getKey()) : itemData.getKey()));
+
+ if(pos==p)
+ itemData.setState(0);
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());
+ DingDongTime itemData = new DingDongTime(times[i].getKey(), times[i].getValue(),1);
itemData.setTime(
nowDay + "" + (itemData.getKey().length() < 2 ? ("0" + itemData.getKey()) : itemData.getKey()));
list.add(itemData);
}
if (times.length - (pos + 1) < 2) {
- DingDongTime itemData = new DingDongTime(times[0].getKey(), times[0].getValue());
+ DingDongTime itemData = new DingDongTime(times[0].getKey(), times[0].getValue(),1);
itemData.setTime(
nextDay + "" + (itemData.getKey().length() < 2 ? ("0" + itemData.getKey()) : itemData.getKey()));
list.add(itemData);
}
-
- List<String> finalTimeList = new ArrayList<>();
- for (DingDongTime time : list)
- finalTimeList.add(time.getTime());
- return finalTimeList;
+ return list;
}
}
--
Gitblit v1.8.0