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
adcbc575
Commit
adcbc575
authored
Dec 27, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预定单 预约单 不走手动派单&半自动派单 逻辑
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
54fe956a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+5
-1
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
adcbc575
...
@@ -22,6 +22,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
...
@@ -22,6 +22,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import
com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo
;
import
com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo
;
import
com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType
;
import
com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderType
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
...
@@ -105,7 +106,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -105,7 +106,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
ConsoleResponseDTO
<
BizDTO
>
storeMix
=
this
.
getStoreMix
(
query
,
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
ConsoleResponseDTO
<
BizDTO
>
storeMix
=
this
.
getStoreMix
(
query
,
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
if
(
storeMix
!=
null
&&
ObjectUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
storeMix
.
getStatusCode
()))
{
if
(
storeMix
!=
null
&&
ObjectUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
storeMix
.
getStatusCode
()))
{
BizDTO
bizVO
=
storeMix
.
getBizVO
();
BizDTO
bizVO
=
storeMix
.
getBizVO
();
if
(
bizVO
!=
null
&&
bizVO
.
getBusinessInfo
()
!=
null
)
{
// fisherman 预约单不走自动|半自动派单逻辑 【【野萃山】手动派单增加半自动配置】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001040800
boolean
unReservedExpress
=
!
Objects
.
equals
(
orderBean
.
getNewOrderType
(),
OrderType
.
RESERVED_EXPRESS
.
getIndex
());
if
(
bizVO
!=
null
&&
bizVO
.
getBusinessInfo
()
!=
null
&&
unReservedExpress
)
{
ExpandFieldsDTO
expandFields
=
bizVO
.
getBusinessInfo
().
getExpandFields
();
ExpandFieldsDTO
expandFields
=
bizVO
.
getBusinessInfo
().
getExpandFields
();
request
.
setDispatchType
(
expandFields
.
getDispatchType
());
request
.
setDispatchType
(
expandFields
.
getDispatchType
());
// fisherman 半自动派单时间获取
// fisherman 半自动派单时间获取
...
...
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