发订阅消息

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

@@ -392,8 +392,9 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
      * 麦咖啡配送消息推送
      */
     public void sendMcCafeMicroMessage(String partnerId,String orderId,int deliveryStatus) {
-        if((deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode() && deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode())
+        if((deliveryStatus != DeliveryStatus.RIDERSTARTDELIVERY.getCode() && deliveryStatus != DeliveryStatus.DELIVERYARRIVED.getCode())
                 || !mcCafePartnerId.equals(partnerId)) {
+            log.info("不发消息", orderId);
             return;
         }
         try {
@@ -408,7 +409,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                 log.error("麦咖啡订阅消息推送失败，查询订单信息失败:"+JSON.toJSONString(response));
             }
             QueryOrdersResponse.DataBean.OrderBean orderBean = response.getData();
-            if(OrderClientType.WE_CHAT.getIndex().equals(orderBean.getOrderClient())) {
+            if(OrderClientType.SAAS.getIndex().toString().equals(orderBean.getOrderClient())) {
                 request.setChannel(1);
             } else {
                 return;