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
0e86d4d2
Commit
0e86d4d2
authored
Sep 24, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
校验 NPE问题
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
4f994237
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
3 deletions
+1
-3
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
+0
-1
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+1
-2
No files found.
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
View file @
0e86d4d2
...
@@ -297,7 +297,6 @@ public class OrderManagerAdapter {
...
@@ -297,7 +297,6 @@ public class OrderManagerAdapter {
if
(
orderBean
==
null
)
{
if
(
orderBean
==
null
)
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_EXIST
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_NOT_EXIST
);
}
}
String
companyId
=
orderBean
.
getCompanyId
();
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderCreateDelivery
(
request
,
orderBean
);
BaseResponse
<
OrderManagerResponse
>
orderManagerResponse
=
orderBeanFactory
.
getOrderManagerService
(
orderBean
).
orderCreateDelivery
(
request
,
orderBean
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
return
handleResponse
(
request
,
orderBean
,
orderManagerResponse
);
}
}
...
...
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
0e86d4d2
...
@@ -370,8 +370,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -370,8 +370,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
QueryFlag
query
=
QueryFlag
.
builder
().
queryBusinessInfo
(
true
).
queryStoreInfo
(
true
).
build
();
QueryFlag
query
=
QueryFlag
.
builder
().
queryBusinessInfo
(
true
).
queryStoreInfo
(
true
).
build
();
ConsoleResponseDTO
<
BizDTO
>
storeMix
=
this
.
getStoreMix
(
query
,
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
ConsoleResponseDTO
<
BizDTO
>
storeMix
=
this
.
getStoreMix
(
query
,
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
// 创建配送单
// 创建配送单
deliveryHandle
.
createDelivery
(
orderBean
,
request
,
storeMix
,
false
);
return
deliveryHandle
.
createDelivery
(
orderBean
,
request
,
storeMix
,
false
);
return
null
;
}
}
@Override
@Override
...
...
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