15紧急需求

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -809,6 +809,8 @@ public class OrderSdkAdapter {
                     addInfo.setDeliveryType(deliveryContactInfoResp.getAddressDetail());
                     addInfo.setExpress(orderInfoReqs.getExpressChannelName());
                     addInfo.setDeliverStatus(orderInfoReqs.getDeliveryState());
+                    addInfo.setRiderName(deliveryContactInfoResp.getContactsName());
+                    addInfo.setRiderPhone(deliveryContactInfoResp.getMobile());
                     data.setAddInfo(addInfo);
                 }
             }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -346,6 +346,10 @@ public class QueryOrdersResponse {
                  * -2默认值 -1:创建失败 0:待接单 1:系统接单 2:分配骑手 3:骑手到店 4:骑手取餐 5:开始配送 6:运单送达 7:运单异常 8:运单取消 9:创建配送单成功
                  */
                 private Integer deliverStatus;
+
+                private String RiderName;
+
+                private String RiderPhone;
             }
 
             @NoArgsConstructor

call-back-service/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-dynamic-queue</artifactId>
-            <version>1.4.RELEASE</version>
+            <version>1.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -978,6 +978,9 @@ public class OrderServiceImpl implements Orderservice {
             orderBean.setSendTime(result.getSendTime());
             orderBean.setCompleteTime(result.getCompleteTime());
         }
+        if(orderBean.getAddInfo()!=null&&StringUtils.isNotEmpty(orderBean.getAddInfo().getRiderPhone())) {
+            orderBean.setRiderPhone(orderBean.getAddInfo().getRiderPhone());
+        }
     }
 
     /**

order-management/order-management.iml

@@ -35,8 +35,8 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.8.RELEASE" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="module" module-name="assortment-ordercenter-sdk" scope="PROVIDED" />
-    <orderEntry type="module" module-name="ordercenter-sdk" scope="PROVIDED" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.2.2.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:ordercenter-sdk:1.1.6.RELEASE" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: cn.freemud.commons:commons-amqp:2.1.0-release" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:1.5.3.RELEASE" level="project" />

order-management/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.7-SNAPSHOT</version>
+            <version>1.2.2.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>