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
aa9cd379
Commit
aa9cd379
authored
Aug 07, 2020
by
张洪旺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 预约单门店 开关话术提示
parent
53014e77
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
155 additions
and
3 deletions
+155
-3
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+1
-1
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/adapter/AbstractOrderCheck.java
+23
-0
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheck.java
+26
-0
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java
+43
-0
order-application-service/src/main/java/cn/freemud/service/adapter/TakeOutOrderCheck.java
+30
-0
order-application-service/src/main/java/cn/freemud/service/adapter/ToStoreCheck.java
+28
-0
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+0
-0
pom.xml
+1
-1
No files found.
order-application-service/pom.xml
View file @
aa9cd379
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
storecenter-sdk
</artifactId>
<artifactId>
storecenter-sdk
</artifactId>
<version>
3.
1.1.RELEASE
</version>
<version>
3.
2.1-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
cn.freemud
</groupId>
<groupId>
cn.freemud
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
aa9cd379
...
@@ -102,7 +102,7 @@ public class CreateOrderVo {
...
@@ -102,7 +102,7 @@ public class CreateOrderVo {
private
String
expectTime
;
private
String
expectTime
;
/**
/**
* 取餐标识 0=我已到店、尽快送出
* 取餐标识 0=我已到店、尽快送出
1预约单
*/
*/
private
String
takeMealFlag
;
private
String
takeMealFlag
;
/**
/**
...
...
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
aa9cd379
...
@@ -61,6 +61,8 @@ public enum ResponseResult {
...
@@ -61,6 +61,8 @@ public enum ResponseResult {
STORE_BIND_MALL_NOT_FOUND
(
"43014"
,
"商城门店存在"
),
STORE_BIND_MALL_NOT_FOUND
(
"43014"
,
"商城门店存在"
),
STORE_DISCONTENT_DELIVERY_CONDITION
(
"43015"
,
"门店起送条件设置错误"
),
STORE_DISCONTENT_DELIVERY_CONDITION
(
"43015"
,
"门店起送条件设置错误"
),
STORE_DISCONTENT_DELIVERY_CUP
(
"43016"
,
"不满足起送杯数"
),
STORE_DISCONTENT_DELIVERY_CUP
(
"43016"
,
"不满足起送杯数"
),
STORE_MAKE_AN_APPOINTMENT_STOP_BUSINESS
(
"43017"
,
"预约失败,请重新下单"
),
STORE_MAKE_AN_APPOINTMENT_OPEN_BUSINESS
(
"43018"
,
"门店不支持预约,请重新选择"
),
/**
/**
* 购物车状态码
* 购物车状态码
...
...
order-application-service/src/main/java/cn/freemud/service/adapter/AbstractOrderCheck.java
0 → 100644
View file @
aa9cd379
package
cn
.
freemud
.
service
.
adapter
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.interceptor.ServiceException
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
java.util.Objects
;
public
abstract
class
AbstractOrderCheck
implements
OrderCheck
{
/**
* 校验门店状态
* @param bizVO
*/
void
doStoreStateCheck
(
StoreResponse
.
BizVO
bizVO
)
{
// 校验门店是否停业 1 营业 2 停业 3 繁忙置休
if
(!
Objects
.
equals
(
bizVO
.
getState
(),
"1"
))
{
throw
new
ServiceException
(
ResponseResult
.
STORE_MAKE_AN_APPOINTMENT_STOP_BUSINESS
);
// 营业
}
else
{
throw
new
ServiceException
(
ResponseResult
.
STORE_MAKE_AN_APPOINTMENT_OPEN_BUSINESS
);
}
}
}
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheck.java
0 → 100644
View file @
aa9cd379
package
cn
.
freemud
.
service
.
adapter
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.enums.CreateOrderType
;
import
cn.freemud.interceptor.ServiceException
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
/**
* 订单检查
*/
public
interface
OrderCheck
{
/***
* 是否匹配
* @param orderType {@link CreateOrderType}
* @return
*/
boolean
support
(
int
orderType
);
/**
* 检查
* @param vo
* @param storeResponse
*/
void
check
(
CreateOrderVo
vo
,
StoreResponse
storeResponse
)
throws
ServiceException
;
}
order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java
0 → 100644
View file @
aa9cd379
package
cn
.
freemud
.
service
.
adapter
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.interceptor.ServiceException
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
com.google.common.collect.Lists
;
import
lombok.extern.slf4j.Slf4j
;
import
java.util.ArrayList
;
import
java.util.Objects
;
/**
* 订单校验
*/
@Slf4j
public
class
OrderCheckAdapter
{
static
ArrayList
<
OrderCheck
>
orderCheckList
=
Lists
.
newArrayList
(
new
ToStoreCheck
(),
new
TakeOutOrderCheck
());
/***
* 校验预约单门店数据
* @param vo
* @param storeResponse
* @throws ServiceException 抛出异常校验异常数据
*/
public
static
void
check
(
CreateOrderVo
vo
,
StoreResponse
storeResponse
)
throws
ServiceException
{
//非预约单的过滤
if
(
Objects
.
isNull
(
vo
.
getOrderType
())
||
(!
Objects
.
equals
(
vo
.
getTakeMealFlag
(),
"1"
)))
{
return
;
}
StoreResponse
.
Configuration
configuration
=
storeResponse
.
getBizVO
().
getStoreConfig
();
log
.
info
(
"门店:{},外卖预约单状态:{},自提预约单状态:{}"
,
vo
.
getShopId
(),
configuration
.
getDeliveryAppoint
(),
configuration
.
getSelfMentionSwitch
());
for
(
OrderCheck
orderCheck
:
orderCheckList
)
{
if
(
orderCheck
.
support
(
vo
.
getOrderType
()))
{
orderCheck
.
check
(
vo
,
storeResponse
);
return
;
}
}
}
}
order-application-service/src/main/java/cn/freemud/service/adapter/TakeOutOrderCheck.java
0 → 100644
View file @
aa9cd379
package
cn
.
freemud
.
service
.
adapter
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.enums.CreateOrderType
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
java.util.Objects
;
/**
* 外卖订单检查
*/
public
class
TakeOutOrderCheck
extends
AbstractOrderCheck
{
@Override
public
boolean
support
(
int
orderType
)
{
return
CreateOrderType
.
TAKE_OUT
.
getCode
()
==
orderType
;
}
@Override
public
void
check
(
CreateOrderVo
vo
,
StoreResponse
storeResponse
)
{
StoreResponse
.
BizVO
bizVO
=
storeResponse
.
getBizVO
();
StoreResponse
.
Configuration
storeConfig
=
bizVO
.
getStoreConfig
();
// 关闭预约单
if
(
Objects
.
equals
(
storeConfig
.
getDeliveryAppoint
(),
0
))
{
super
.
doStoreStateCheck
(
bizVO
);
}
}
}
order-application-service/src/main/java/cn/freemud/service/adapter/ToStoreCheck.java
0 → 100644
View file @
aa9cd379
package
cn
.
freemud
.
service
.
adapter
;
import
cn.freemud.entities.vo.CreateOrderVo
;
import
cn.freemud.enums.CreateOrderType
;
import
com.freemud.application.sdk.api.storecenter.response.StoreResponse
;
import
java.util.Objects
;
/**
* 到店订单检查
*/
public
class
ToStoreCheck
extends
AbstractOrderCheck
{
@Override
public
boolean
support
(
int
orderType
)
{
return
CreateOrderType
.
COLLECT_GOODS
.
getCode
()
==
orderType
;
}
@Override
public
void
check
(
CreateOrderVo
vo
,
StoreResponse
storeResponse
)
{
StoreResponse
.
BizVO
bizVO
=
storeResponse
.
getBizVO
();
StoreResponse
.
Configuration
storeConfig
=
bizVO
.
getStoreConfig
();
// 关闭预约单
if
(
Objects
.
equals
(
storeConfig
.
getSelfMentionSwitch
(),
0
))
{
super
.
doStoreStateCheck
(
bizVO
);
}
}
}
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
aa9cd379
This diff is collapsed.
Click to expand it.
pom.xml
View file @
aa9cd379
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
sdk-common-base
</artifactId>
<artifactId>
sdk-common-base
</artifactId>
<version>
1.
3.9-SNAPSHOT
</version>
<version>
1.
5.2.RELEASE
</version>
</dependency>
</dependency>
<!-- mybatis -->
<!-- mybatis -->
...
...
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