Commit c442998c by 徐康

麦咖啡订单详情返回收货地址id

parent 2efdcc84
......@@ -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);
}
}
......
......@@ -407,6 +407,8 @@ public class QueryOrdersResponse {
private String RiderName;
private String RiderPhone;
private String extInfo;
}
@NoArgsConstructor
......
......@@ -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();
......
......@@ -175,6 +175,10 @@ public class QueryOrderResponseVo {
* 付款方式 微信支付
*/
private String orderPayType;
/**
* 收货地址id
*/
private String receiveId;
/**
* 支付渠道
......
......@@ -61,4 +61,7 @@ public class DeliveryContactInfoResp {
//运单号
private String expressNo;
//扩展字段
private String extInfo;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment