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
1d0351db
Commit
1d0351db
authored
Dec 30, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商家自配送 不走 手动\半自动派单
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
5df0690d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+3
-1
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
1d0351db
...
...
@@ -104,6 +104,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
public
BaseResponse
<
OrderManagerResponse
>
orderConfirm
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
QueryFlag
query
=
QueryFlag
.
builder
().
queryBusinessInfo
(
true
).
queryStoreInfo
(
true
).
build
();
ConsoleResponseDTO
<
BizDTO
>
storeMix
=
this
.
getStoreMix
(
query
,
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
boolean
idAutoCreate
=
false
;
if
(
storeMix
!=
null
&&
ObjectUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
storeMix
.
getStatusCode
()))
{
BizDTO
bizVO
=
storeMix
.
getBizVO
();
// fisherman 预约单不走自动|半自动派单逻辑 【【野萃山】手动派单增加半自动配置】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001040800
...
...
@@ -115,13 +116,14 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
request
.
setDispatchType
(
expandFields
.
getDispatchType
());
// fisherman 半自动派单时间获取
request
.
setDispatchTimeout
(
deliveryHandle
.
getDispatchTimeout
(
expandFields
.
getDispatchConfig
()));
idAutoCreate
=
true
;
}
}
// 订单接单
BaseResponse
baseResponse
=
saasOrderHandle
.
orderConfirm
(
request
,
orderBean
);
// 使用feign调用 获取门店信息
// 创建配送单
deliveryHandle
.
createDelivery
(
orderBean
,
request
,
storeMix
,
tru
e
);
deliveryHandle
.
createDelivery
(
orderBean
,
request
,
storeMix
,
idAutoCreat
e
);
// 推送pos、微信消息中心 重复接单不重复推消息(针对蜜雪做的修改)
if
(
baseResponse
!=
null
&&
baseResponse
.
getResult
()
==
null
){
orderBaseService
.
sendMessage
(
orderBean
,
OperateType
.
ORDER_CONFIRM
,
request
.
getReason
());
...
...
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