Commit 6780c777 by 姜海波

骑手电话

parents 43dea5db 74b73e4d
...@@ -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);
} }
} }
......
...@@ -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
......
...@@ -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();
......
...@@ -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());
}
} }
/** /**
......
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