Commit d73d5573 by 姜海波

15紧急需求

parent 6f2465e0
...@@ -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
......
...@@ -976,6 +976,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -976,6 +976,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());
}
} }
/** /**
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.1.5.RELEASE</version> <version>1.2.2.RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
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