发订阅消息

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

@@ -224,6 +224,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
                 updateDeliveryStatus(request);
             }
+            sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
             return baseResponse;
         } else if (deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode() ){
             orderManagerRequest.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
@@ -231,6 +232,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(baseResponse.getCode())) {
                 updateDeliveryStatus(request);
             }
+            sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
             return baseResponse;
         } else if(deliveryStatus == DeliveryStatus.WATINGORDER.getCode() || deliveryStatus == DeliveryStatus.SYSTEMGETORDER.getCode()
                 || deliveryStatus == DeliveryStatus.ALLOTRIDER.getCode()|| deliveryStatus == DeliveryStatus.RIDERARRIVESTORE.getCode()) {
@@ -249,7 +251,6 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             updateDeliveryStatus(request);
             return ResponseUtil.success();
         }
-        sendMcCafeMicroMessage(request.getPartnerId(), request.getOrderId(), request.getDeliveryStatus());
         return ResponseUtil.error(ResponseResult.ORDER_DELIVERY_CALL_BACK_FAILED);
     }
 
@@ -390,7 +391,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
      * 麦咖啡配送消息推送
      */
     public void sendMcCafeMicroMessage(String partnerId,String orderId,int deliveryStatus) {
-        if(!mcCafePartnerId.equals(partnerId)) {
+        if((deliveryStatus == DeliveryStatus.RIDERSTARTDELIVERY.getCode() && deliveryStatus == DeliveryStatus.DELIVERYARRIVED.getCode())
+                || !mcCafePartnerId.equals(partnerId)) {
             return;
         }
         try {
@@ -434,6 +436,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
                         .orderAmount(String.valueOf(new Float(orderBean.getActualPayAmount())/100))
                         .utcTime(cn.freemud.base.util.DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"))
                         .build());
+            } else {
+                return;
             }
             ecologyAdminApplicationClient.subscribeMessage(request);