Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
a10aad26
Commit
a10aad26
authored
Aug 18, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提示语
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
aadff706
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+3
-2
No files found.
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
a10aad26
...
...
@@ -177,6 +177,7 @@ public enum ResponseResult {
COUPON_INVALID
(
"45070"
,
"券已锁定,请先支付或取消待支付订单"
,
""
),
ORDER_RECEIVE_ERR
(
"45071"
,
"确认收货失败,请稍后再试"
,
""
),
STORE_NO_OPEN
(
"45072"
,
"选择时间不在门店营业时间范围内"
,
""
),
STORE_SELF_ERROR_10
(
"45073"
,
"请选择截止营业时间大于10分钟下单"
,
""
),
/**
* 售后单
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
a10aad26
...
...
@@ -284,7 +284,8 @@ public class CheckOrder {
if
(
StringUtils
.
isBlank
(
takeMealTimes
))
{
//todo 这里是重点: 门店如果营业结束,下明天的单子就会 传递 expectTime 时间
if
(
StringUtils
.
isNotBlank
(
createOrderVo
.
getExpectTime
()))
{
takeMealTimes
=
createOrderVo
.
getExpectTime
();
// 预定单 当天营业结束 _> 不准下单
throw
new
ServiceException
(
ResponseResult
.
STORE_SELF_ERROR_10
);
}
else
{
throw
new
ServiceException
(
ResponseResult
.
PARAMETER_MISSING
);
}
...
...
@@ -448,7 +449,7 @@ public class CheckOrder {
//每段营业时间校验
BusinessDate
businessDate2
=
this
.
getStoreBusinessDate
(
todayTime
,
true
);
if
(
createOrder
.
after
(
businessDate2
.
getEndDate
()))
{
throw
new
ServiceException
(
ResponseResult
.
ORDER_TAKEMEALTIME_INVAILD
);
throw
new
ServiceException
(
ResponseResult
.
STORE_SELF_ERROR_10
);
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment