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
6780c777
Commit
6780c777
authored
Mar 19, 2020
by
姜海波
Browse files
Options
Browse Files
Download
Plain Diff
骑手电话
parents
43dea5db
74b73e4d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
0 deletions
+11
-0
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/adapter/OrderAdapter.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
6780c777
...
@@ -808,6 +808,8 @@ public class OrderSdkAdapter {
...
@@ -808,6 +808,8 @@ public class OrderSdkAdapter {
addInfo
.
setDeliveryType
(
deliveryContactInfoResp
.
getAddressDetail
());
addInfo
.
setDeliveryType
(
deliveryContactInfoResp
.
getAddressDetail
());
addInfo
.
setExpress
(
orderInfoReqs
.
getExpressChannelName
());
addInfo
.
setExpress
(
orderInfoReqs
.
getExpressChannelName
());
addInfo
.
setDeliverStatus
(
orderInfoReqs
.
getDeliveryState
());
addInfo
.
setDeliverStatus
(
orderInfoReqs
.
getDeliveryState
());
addInfo
.
setRiderName
(
deliveryContactInfoResp
.
getContactsName
());
addInfo
.
setRiderPhone
(
deliveryContactInfoResp
.
getMobile
());
data
.
setAddInfo
(
addInfo
);
data
.
setAddInfo
(
addInfo
);
}
}
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
6780c777
...
@@ -346,6 +346,10 @@ public class QueryOrdersResponse {
...
@@ -346,6 +346,10 @@ public class QueryOrdersResponse {
* -2默认值 -1:创建失败 0:待接单 1:系统接单 2:分配骑手 3:骑手到店 4:骑手取餐 5:开始配送 6:运单送达 7:运单异常 8:运单取消 9:创建配送单成功
* -2默认值 -1:创建失败 0:待接单 1:系统接单 2:分配骑手 3:骑手到店 4:骑手取餐 5:开始配送 6:运单送达 7:运单异常 8:运单取消 9:创建配送单成功
*/
*/
private
Integer
deliverStatus
;
private
Integer
deliverStatus
;
private
String
RiderName
;
private
String
RiderPhone
;
}
}
@NoArgsConstructor
@NoArgsConstructor
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
6780c777
...
@@ -848,6 +848,8 @@ public class OrderAdapter {
...
@@ -848,6 +848,8 @@ public class OrderAdapter {
responseVo
.
setReceiveCity
(
ordersBean
.
getReceiveCity
());
responseVo
.
setReceiveCity
(
ordersBean
.
getReceiveCity
());
responseVo
.
setReceiveRegion
(
ordersBean
.
getReceiveRegion
());
responseVo
.
setReceiveRegion
(
ordersBean
.
getReceiveRegion
());
responseVo
.
setReceiveMobile
(
ordersBean
.
getPhone
());
responseVo
.
setReceiveMobile
(
ordersBean
.
getPhone
());
if
(
ordersBean
.
getAddInfo
()!=
null
&&
StringUtils
.
isNotEmpty
(
ordersBean
.
getAddInfo
().
getRiderPhone
()))
responseVo
.
setRiderPhone
(
ordersBean
.
getAddInfo
().
getRiderPhone
());
responseVo
.
setTakeMealType
(
ordersBean
.
getGmtExpect
()
==
null
?
0
:
1
);
responseVo
.
setTakeMealType
(
ordersBean
.
getGmtExpect
()
==
null
?
0
:
1
);
responseVo
.
setTakeMealTypeDesc
(
responseVo
.
getTakeMealType
()
==
0
?
"立即取餐"
:
"预约取餐"
);
responseVo
.
setTakeMealTypeDesc
(
responseVo
.
getTakeMealType
()
==
0
?
"立即取餐"
:
"预约取餐"
);
String
extInfo
=
ordersBean
.
getExtInfo
();
String
extInfo
=
ordersBean
.
getExtInfo
();
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
6780c777
...
@@ -978,6 +978,9 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -978,6 +978,9 @@ public class OrderServiceImpl implements Orderservice {
orderBean
.
setSendTime
(
result
.
getSendTime
());
orderBean
.
setSendTime
(
result
.
getSendTime
());
orderBean
.
setCompleteTime
(
result
.
getCompleteTime
());
orderBean
.
setCompleteTime
(
result
.
getCompleteTime
());
}
}
if
(
orderBean
.
getAddInfo
()!=
null
&&
StringUtils
.
isNotEmpty
(
orderBean
.
getAddInfo
().
getRiderPhone
()))
{
orderBean
.
setRiderPhone
(
orderBean
.
getAddInfo
().
getRiderPhone
());
}
}
}
/**
/**
...
...
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