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
6dab277d
Commit
6dab277d
authored
Sep 09, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 外卖单才同步配送取餐码
parent
55738b82
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
+12
-10
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
View file @
6dab277d
...
...
@@ -72,16 +72,18 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_UPDATE_PICKUP_FAILED
);
}
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss'Z'"
);
DeliveryOrderAssemblyackRequest
assemblyAckRequest
=
new
DeliveryOrderAssemblyackRequest
();
assemblyAckRequest
.
setOrderKey
(
request
.
getOrderId
());
assemblyAckRequest
.
setDisplayOrderNumber
(
request
.
getPickUpGoodsNo
());
assemblyAckRequest
.
setAssemblyTimeUTC
(
dateFormat
.
format
(
DateUtil
.
addHours
(
new
Date
(),
-
8
)));
assemblyAckRequest
.
setStoreId
(
orderBean
.
getShopId
());
//入机成功通知配送
DeliveryResponseDto
deliveryResponse
=
deliveryMCCafeClient
.
assemblyAck
(
assemblyAckRequest
);
if
(
deliveryResponse
==
null
||
!
StringUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
deliveryResponse
.
getCode
()+
""
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_ASSEMBLY_ACK_ERROR
);
if
(
Objects
.
equals
(
orderBean
.
getOrderType
(),
OrderType
.
TAKE_OUT
.
getCode
()))
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss'Z'"
);
DeliveryOrderAssemblyackRequest
assemblyAckRequest
=
new
DeliveryOrderAssemblyackRequest
();
assemblyAckRequest
.
setOrderKey
(
request
.
getOrderId
());
assemblyAckRequest
.
setDisplayOrderNumber
(
request
.
getPickUpGoodsNo
());
assemblyAckRequest
.
setAssemblyTimeUTC
(
dateFormat
.
format
(
DateUtil
.
addHours
(
new
Date
(),
-
8
)));
assemblyAckRequest
.
setStoreId
(
orderBean
.
getShopId
());
//入机成功通知配送
DeliveryResponseDto
deliveryResponse
=
deliveryMCCafeClient
.
assemblyAck
(
assemblyAckRequest
);
if
(
deliveryResponse
==
null
||
!
StringUtils
.
equals
(
ResponseResult
.
SUCCESS
.
getCode
(),
deliveryResponse
.
getCode
()
+
""
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
DELIVERY_ASSEMBLY_ACK_ERROR
);
}
}
}
if
(!
Objects
.
equals
(
orderBean
.
getOrderType
(),
OrderType
.
TAKE_OUT
.
getCode
()))
{
...
...
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