Commit a10aad26 by 周晓航

修改提示语

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent aadff706
...@@ -177,6 +177,7 @@ public enum ResponseResult { ...@@ -177,6 +177,7 @@ public enum ResponseResult {
COUPON_INVALID("45070", "券已锁定,请先支付或取消待支付订单",""), COUPON_INVALID("45070", "券已锁定,请先支付或取消待支付订单",""),
ORDER_RECEIVE_ERR("45071", "确认收货失败,请稍后再试",""), ORDER_RECEIVE_ERR("45071", "确认收货失败,请稍后再试",""),
STORE_NO_OPEN("45072", "选择时间不在门店营业时间范围内",""), STORE_NO_OPEN("45072", "选择时间不在门店营业时间范围内",""),
STORE_SELF_ERROR_10("45073", "请选择截止营业时间大于10分钟下单",""),
/** /**
* 售后单 * 售后单
......
...@@ -284,7 +284,8 @@ public class CheckOrder { ...@@ -284,7 +284,8 @@ public class CheckOrder {
if (StringUtils.isBlank(takeMealTimes)) { if (StringUtils.isBlank(takeMealTimes)) {
//todo 这里是重点: 门店如果营业结束,下明天的单子就会 传递 expectTime 时间 //todo 这里是重点: 门店如果营业结束,下明天的单子就会 传递 expectTime 时间
if (StringUtils.isNotBlank(createOrderVo.getExpectTime())) { if (StringUtils.isNotBlank(createOrderVo.getExpectTime())) {
takeMealTimes = createOrderVo.getExpectTime(); // 预定单 当天营业结束 _> 不准下单
throw new ServiceException(ResponseResult.STORE_SELF_ERROR_10);
}else { }else {
throw new ServiceException(ResponseResult.PARAMETER_MISSING); throw new ServiceException(ResponseResult.PARAMETER_MISSING);
} }
...@@ -448,7 +449,7 @@ public class CheckOrder { ...@@ -448,7 +449,7 @@ public class CheckOrder {
//每段营业时间校验 //每段营业时间校验
BusinessDate businessDate2 = this.getStoreBusinessDate(todayTime, true); BusinessDate businessDate2 = this.getStoreBusinessDate(todayTime, true);
if (createOrder.after(businessDate2.getEndDate())) { if (createOrder.after(businessDate2.getEndDate())) {
throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD); throw new ServiceException(ResponseResult.STORE_SELF_ERROR_10);
} }
} }
} }
......
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