rocketmq.delivery.enable:false

order-application-service/src/main/java/cn/freemud/amp/service/ProduceMQService.java

@@ -10,10 +10,12 @@ import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Throwables;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.message.MessageConst;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Service;
@@ -32,26 +34,36 @@ public class ProduceMQService {
     @Resource
     private RocketMQTemplate deliveryRocketMqTemplate;
 
+    @Value("${rocketmq.delivery.enable:false}")
+    private Boolean rocketMQDeliveryEnable;
+
     /**
-     * @Description 发现配送信息到rabbitMQ
      * @param deliveryRequest
+     * @Description 发现配送信息到rabbitMQ
      */
     public void sendOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) {
         Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), "open-platform-order-delivery-queue");
         MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage<>(header, deliveryRequest);
-        mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.OPEN_PLATFORM_ORDER_DELIVERY_ROUTING_KEY, mqMessage);
+        try {
+            mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.OPEN_PLATFORM_ORDER_DELIVERY_ROUTING_KEY, mqMessage);
+        } catch (Exception e) {
+            log.error("sendOfDeliveryInfo.error, message:{}, cause:{}", JSON.toJSONString(deliveryRequest), Throwables.getStackTraceAsString(e));
+        }
     }
 
     /**
-     * @Description 发送配送信息到rocketMq:
      * @param deliveryRequest
+     * @Description 发送配送信息到rocketMq:
      */
     public void sendRocketMqOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) {
+
+        if (BooleanUtils.isNotTrue(rocketMQDeliveryEnable)) {
+            return;
+        }
+
         Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), RocketMQConst.ORDER_THIRD_PUSH_TOPIC);
         MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage(header, deliveryRequest);
-
         String destination = String.format("%s:%s", RocketMQConst.ORDER_THIRD_PUSH_TOPIC, RocketMQConst.OrderSubsidiaryTag.delivery);
-
         Message message = MessageBuilder
                 .withPayload(mqMessage)
                 .setHeader("partnerId", deliveryRequest.getPartnerId())

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

 package cn.freemud.service.delivery;
 
 import cn.freemud.amp.service.ProduceMQService;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQAction;
-import cn.freemud.amqp.MQMessage;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryAmountRequestDto;
@@ -131,6 +128,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
 
         // 订单配送状态变化时发送到MQ
         if (DeliveryStatus.checkDeliveryStatueForPlatform(deliveryStatus)) {
+            produceMQService.sendOfDeliveryInfo(request);
             produceMQService.sendRocketMqOfDeliveryInfo(request);
         }
 //        else {