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
c442998c
Commit
c442998c
authored
Sep 07, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
麦咖啡订单详情返回收货地址id
parent
2efdcc84
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
0 deletions
+14
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+2
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+4
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+4
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/DeliveryContactInfoResp.java
+3
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
c442998c
...
...
@@ -942,6 +942,7 @@ public class OrderSdkAdapter {
addInfo
.
setDeliverStatus
(
orderInfoReqs
.
getDeliveryState
());
addInfo
.
setRiderName
(
deliveryContactInfoResp
.
getContactsName
());
addInfo
.
setRiderPhone
(
deliveryContactInfoResp
.
getMobile
());
addInfo
.
setExtInfo
(
deliveryContactInfoResp
.
getExtInfo
());
data
.
setAddInfo
(
addInfo
);
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
c442998c
...
...
@@ -407,6 +407,8 @@ public class QueryOrdersResponse {
private
String
RiderName
;
private
String
RiderPhone
;
private
String
extInfo
;
}
@NoArgsConstructor
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
c442998c
...
...
@@ -965,6 +965,10 @@ public class OrderAdapter {
responseVo
.
setReceiveMobile
(
ordersBean
.
getPhone
());
if
(
ordersBean
.
getAddInfo
()!=
null
&&
StringUtils
.
isNotEmpty
(
ordersBean
.
getAddInfo
().
getRiderPhone
()))
responseVo
.
setRiderPhone
(
ordersBean
.
getAddInfo
().
getRiderPhone
());
if
(
ordersBean
.
getAddInfo
()!=
null
&&
StringUtils
.
isNotEmpty
(
ordersBean
.
getAddInfo
().
getExtInfo
()))
{
JSONObject
extInfo
=
JSONObject
.
parseObject
(
ordersBean
.
getAddInfo
().
getExtInfo
());
responseVo
.
setReceiveId
(
extInfo
.
getString
(
"receiveId"
));
}
responseVo
.
setTakeMealType
(
ordersBean
.
getGmtExpect
()
==
null
?
0
:
1
);
responseVo
.
setTakeMealTypeDesc
(
responseVo
.
getTakeMealType
()
==
0
?
"立即取餐"
:
"预约取餐"
);
String
extInfo
=
ordersBean
.
getExtInfo
();
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
c442998c
...
...
@@ -175,6 +175,10 @@ public class QueryOrderResponseVo {
* 付款方式 微信支付
*/
private
String
orderPayType
;
/**
* 收货地址id
*/
private
String
receiveId
;
/**
* 支付渠道
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/DeliveryContactInfoResp.java
View file @
c442998c
...
...
@@ -61,4 +61,7 @@ public class DeliveryContactInfoResp {
//运单号
private
String
expressNo
;
//扩展字段
private
String
extInfo
;
}
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