Skip to content

O
order-group
Commit 49f3cf94 by 周晓航
Options

Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into qa

parents bafdbadd 7cb16f7f
Showing with 3 additions and 3 deletions
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
...@@ -427,10 +427,10 @@ public class CheckOrder { ...@@ -427,10 +427,10 @@ public class CheckOrder {
} }
for (String bussinessTime : nextDayBusinessTime) { for (String bussinessTime : nextDayBusinessTime) {
BusinessDate bussinessTime2 = this.getStoreBusinessDate(bussinessTime, true); BusinessDate bussinessTime2 = this.getStoreBusinessDate(bussinessTime, true);
AppLogUtil.infoLog("fisherman 校验门店时间数据 02", JSON.toJSONString(bussinessTime2),null); AppLogUtil.infoLog("fisherman 校验门店时间数据 02", JSON.toJSONString(bussinessTime2),takeMealDateTime);
// 取餐时间在营业时间前面, 或者在营业结束时间后面 // 取餐时间在营业时间前面, 或者在营业结束时间后面
boolean isTrue = takeMealDateTime.before(bussinessTime2.getStartDate()) || takeMealDateTime.after(bussinessTime2.getEndDate()); boolean isTrue = takeMealDateTime.after(bussinessTime2.getStartDate()) && takeMealDateTime.before(bussinessTime2.getEndDate());
if (isTrue) { if (!isTrue) {
throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD); throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment