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
jenkins
order-group
Commits
bd1d4b3e
Commit
bd1d4b3e
authored
Mar 12, 2020
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
未营业可以下预约单调整
parent
f63d9d0b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
bd1d4b3e
...
@@ -50,7 +50,7 @@ public enum ResponseResult {
...
@@ -50,7 +50,7 @@ public enum ResponseResult {
STORE_ITEM_CHECK_VAILD_ERROR
(
"43005"
,
"门店商品校验失败"
),
STORE_ITEM_CHECK_VAILD_ERROR
(
"43005"
,
"门店商品校验失败"
),
STORE_ITEM_CHECK_INVAILD
(
"43006"
,
"商品无效"
),
STORE_ITEM_CHECK_INVAILD
(
"43006"
,
"商品无效"
),
STORE_ITEM_CHECK_DISCOUNT_CHANGE
(
"43010"
,
"商品限购活动已变更"
),
STORE_ITEM_CHECK_DISCOUNT_CHANGE
(
"43010"
,
"商品限购活动已变更"
),
STORE_ITEM_CHECK_CLOSE
(
"43007"
,
"门店已打烊"
),
STORE_ITEM_CHECK_CLOSE
(
"43007"
,
"门店已打烊
,请预约点餐
"
),
STORE_ITEM_STOP_BUSINESS
(
"43010"
,
"门店已停业"
),
STORE_ITEM_STOP_BUSINESS
(
"43010"
,
"门店已停业"
),
STORE_ITEM_NOT_DELIVERY
(
"43008"
,
"门店不支持外卖配送"
),
STORE_ITEM_NOT_DELIVERY
(
"43008"
,
"门店不支持外卖配送"
),
STORE_ITEM_NOT_IN_DELIVERY_LIMIT_AMOUNT
(
"43009"
,
"订单金额未满足门店起送费"
),
STORE_ITEM_NOT_IN_DELIVERY_LIMIT_AMOUNT
(
"43009"
,
"订单金额未满足门店起送费"
),
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
bd1d4b3e
...
@@ -143,7 +143,8 @@ public class CheckOrder {
...
@@ -143,7 +143,8 @@ public class CheckOrder {
if
(
storeResponseDto
.
getActiveFlag
()
==
null
||
storeResponseDto
.
getActiveFlag
()
!=
1
)
{
if
(
storeResponseDto
.
getActiveFlag
()
==
null
||
storeResponseDto
.
getActiveFlag
()
!=
1
)
{
throw
new
ServiceException
(
ResponseResult
.
STORE_ITEM_STOP_BUSINESS
);
throw
new
ServiceException
(
ResponseResult
.
STORE_ITEM_STOP_BUSINESS
);
}
}
if
(!
StoreConstant
.
BUSINESS
.
equals
(
storeResponseDto
.
getState
()))
{
//未营业无预约时间无法下单
if
(!
StoreConstant
.
BUSINESS
.
equals
(
storeResponseDto
.
getState
())
&&
StringUtils
.
isBlank
(
createOrderVo
.
getTakeMealTime
()))
{
throw
new
ServiceException
(
ResponseResult
.
STORE_ITEM_CHECK_CLOSE
);
throw
new
ServiceException
(
ResponseResult
.
STORE_ITEM_CHECK_CLOSE
);
}
}
//设置营业开始和结束时间
//设置营业开始和结束时间
...
...
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