Merge branch '20201127_coco配送进程' into develop

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1208,6 +1208,7 @@ public class OrderAdapter {
             if (ordersBean.getDeliverStatus() != null) {
                 responseVo.setHasThirdDelivery(true);
             }
+            responseVo.setDeliveryStatus(ordersBean.getDeliverStatus());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setButtonRefund(orderViewStatusDto.getButtonRefund());
             responseVo.setButtonContactPartner(orderViewStatusDto.getButtonContactPartner());

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -310,6 +310,10 @@ public class QueryOrderResponseVo {
      * 是否是第三方配送单
      */
     private Boolean hasThirdDelivery;
+    /**
+     * 配送状态
+     */
+    private Integer deliveryStatus;
 
     /**
      * 骑手名称 商家自配送名称

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -418,17 +418,19 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                     StoreInfoRequest storeInfoRequest = new StoreInfoRequest(partnerId, orderBean.getShopId(),null);
                     StoreResponse storeResponse = storeCenterService.getStoreInfo(storeInfoRequest, LogThreadLocal.getTrackingNo());
                     //立即单外卖
-                    if (OrderType.GENERAL_EXPRESS.getIndex().equals(orderBean.getNewOrderType())) {
+                    if (OrderType.GENERAL_EXPRESS.getIndex()==orderBean.getNewOrderType()) {
                         if(storeResponse != null && storeResponse.getBizVO() != null && storeResponse.getBizVO().getServiceTime() != null){
                             createTime = createTime + storeResponse.getBizVO().getServiceTime()*1000*60;
                             orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(createTime));
                         }
                     }//预约单外卖
-                    if(OrderType.RESERVED_EXPRESS.getIndex().equals(orderBean.getNewOrderType())&&orderBean.getGmtExpect()!=null){
+                    if(OrderType.RESERVED_EXPRESS.getIndex()==orderBean.getNewOrderType()&&orderBean.getGmtExpect()!=null){
                         orderDeliveryScene.setEstimateArrivalTime(DateTimeUtil.timeStampToTime(orderBean.getGmtExpect()));
                     }
                     orderDeliveryScene.setMerchantPhone(storeResponse.getBizVO().getPhone());
                     orderDeliveryScene.setOrderNo(orderId);
+                    request.setOrderDeliveryScene(orderDeliveryScene);
+                    ecologyAdminApplicationClient.subscribeMessage(request);
                 }
                 //配送异常模板消息
                 if(deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode() || deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode()){
@@ -439,8 +441,10 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                     deliveryErrorReminder.setMerchantPhone(orderBean.getShopPhone());
                     deliveryErrorReminder.setAddress(orderBean.getAddress());
                     deliveryErrorReminder.setRemark("订单配送异常，请电话联系门店确认哦");
+                    request.setDeliveryErrorReminder(deliveryErrorReminder);
+                    ecologyAdminApplicationClient.subscribeMessage(request);
                 }
-                ecologyAdminApplicationClient.subscribeMessage(request);
+
             }catch (Exception e){
                 log.error("配送订阅消息推送失败:{},失败原因:{}",orderId,e.getMessage());
             }