|
@@ -118,6 +118,7 @@ public class PromotionFactoryBase extends ServiceImpl<PromotionMapper, Promotion
|
|
|
for (int i = 0; i < promotionList.size(); i++) {
|
|
|
Promotion promotion = promotionList.get(i);
|
|
|
if (!promotion.getIsAllDay()) {
|
|
|
+ Boolean timeCondition = false;
|
|
|
String dayTime = promotion.getDayTime();
|
|
|
JSONArray jsonArray = JSONUtil.parseArray(dayTime);
|
|
|
for (int j = 0; j < jsonArray.size(); j++) {
|
|
@@ -125,10 +126,14 @@ public class PromotionFactoryBase extends ServiceImpl<PromotionMapper, Promotion
|
|
|
LocalTime startTime = LocalTime.parse(jsonObject.get("startTime").toString() + ":00", DateTimeFormatter.ofPattern("HH:mm:ss"));
|
|
|
LocalTime endTime = LocalTime.parse(jsonObject.get("endTime").toString() + ":00", DateTimeFormatter.ofPattern("HH:mm:ss"));
|
|
|
// 判断 orderCreateTime 是否在指定时间段内
|
|
|
- if (orderTime.isBefore(startTime) || orderTime.isAfter(endTime)) {
|
|
|
- promotionList.remove(i);
|
|
|
+ if (!orderTime.isBefore(startTime) && !orderTime.isAfter(endTime)) {
|
|
|
+ timeCondition = true;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
+ if (!timeCondition) {
|
|
|
+ promotionList.remove(i);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|