Merge branch 'master' into test6.8.6.5

@@ -26,9 +26,10 @@ public class BuyerOrderCancelShamDeliveryHandler implements IEventHandler<BuyerO
     @Override
     @Subscribe
     public void handle(BuyerOrderCancelShamDeliveryEvent event) {
-        int minutes = DelayTime.CANCEL_SHAM_DELIVERY_TIME_MINUTE ;
-        logger.info("Subscribe Buyer Order Cancel ShamDelivery Event delay msg, minutes {} ,event {}", minutes ,event);
+        logger.info("do nothing and return ! Subscribe Buyer Order Cancel ShamDelivery Event delay msg,event {}" ,event);
+        //int minutes = DelayTime.CANCEL_SHAM_DELIVERY_TIME_MINUTE ;
+        //logger.info("Subscribe Buyer Order Cancel ShamDelivery Event delay msg, minutes {} ,event {}", minutes ,event);
 
-        tradeMqSender.send(TopicConstants.BUYER_ORDER_CANCEL_SHAM_DELIVER, event, minutes);
+        //tradeMqSender.send(TopicConstants.BUYER_ORDER_CANCEL_SHAM_DELIVER, event, minutes);
     }
 }

@@ -23,10 +23,10 @@ consumer:
               delay:
                     interval: 1440
 
-            - class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
-              topic: buyerOrder.cancelShamDeliver
-              delay:
-                    interval: 5760
+            #- class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
+            #  topic: buyerOrder.cancelShamDeliver
+            #  delay:
+            #        interval: 5760
 
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
               topic: order.notPaidNotice

@@ -23,10 +23,10 @@ consumer:
               delay:
                     interval: 1440
 
-            - class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
-              topic: buyerOrder.cancelShamDeliver
-              delay:
-                    interval: 5760
+            #- class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
+            #  topic: buyerOrder.cancelShamDeliver
+            #  delay:
+            #        interval: 5760
 
             #order.notPaidNotice
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer