Commit a87423db by 张洪旺

Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

parents 8eec9827 22b05626
...@@ -289,7 +289,7 @@ public class CheckOrder { ...@@ -289,7 +289,7 @@ public class CheckOrder {
Date todayEnd = DateUtil.setEndDay(new Date()); Date todayEnd = DateUtil.setEndDay(new Date());
boolean toDay = orderDate.before(todayEnd); boolean toDay = orderDate.before(todayEnd);
BusinessDate businessDate = getStoreBusinessDate(storeResponseDto, toDay); BusinessDate businessDate = getStoreBusinessDate(storeResponseDto, toDay);
boolean businessEndDate = (DateUtils.addMinutes(orderDate, 45).compareTo(businessDate.getEndDate()) <= 0); boolean businessEndDate = (DateUtils.addMinutes(orderDate, 45).compareTo(businessDate.getEndDate()) >= 0);
if (businessEndDate) { if (businessEndDate) {
throw new ServiceException(ResponseResult.STORE_SELF_ERROR); throw new ServiceException(ResponseResult.STORE_SELF_ERROR);
} }
......
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