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
jenkins
order-group
Commits
d73d5573
Commit
d73d5573
authored
Mar 18, 2020
by
姜海波
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
15紧急需求
parent
6f2465e0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletions
+10
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+4
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-0
order-management/pom.xml
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
d73d5573
...
...
@@ -808,6 +808,8 @@ public class OrderSdkAdapter {
addInfo
.
setDeliveryType
(
deliveryContactInfoResp
.
getAddressDetail
());
addInfo
.
setExpress
(
orderInfoReqs
.
getExpressChannelName
());
addInfo
.
setDeliverStatus
(
orderInfoReqs
.
getDeliveryState
());
addInfo
.
setRiderName
(
deliveryContactInfoResp
.
getContactsName
());
addInfo
.
setRiderPhone
(
deliveryContactInfoResp
.
getMobile
());
data
.
setAddInfo
(
addInfo
);
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
d73d5573
...
...
@@ -346,6 +346,10 @@ public class QueryOrdersResponse {
* -2默认值 -1:创建失败 0:待接单 1:系统接单 2:分配骑手 3:骑手到店 4:骑手取餐 5:开始配送 6:运单送达 7:运单异常 8:运单取消 9:创建配送单成功
*/
private
Integer
deliverStatus
;
private
String
RiderName
;
private
String
RiderPhone
;
}
@NoArgsConstructor
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
d73d5573
...
...
@@ -976,6 +976,9 @@ public class OrderServiceImpl implements Orderservice {
orderBean
.
setSendTime
(
result
.
getSendTime
());
orderBean
.
setCompleteTime
(
result
.
getCompleteTime
());
}
if
(
orderBean
.
getAddInfo
()!=
null
&&
StringUtils
.
isNotEmpty
(
orderBean
.
getAddInfo
().
getRiderPhone
()))
{
orderBean
.
setRiderPhone
(
orderBean
.
getAddInfo
().
getRiderPhone
());
}
}
/**
...
...
order-management/pom.xml
View file @
d73d5573
...
...
@@ -35,7 +35,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-ordercenter-sdk
</artifactId>
<version>
1.
1.5
.RELEASE
</version>
<version>
1.
2.2
.RELEASE
</version>
<scope>
provided
</scope>
</dependency>
<dependency>
...
...
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