Merge branch 'test6.9.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.2

@@ -10,7 +10,6 @@ import com.yohoufo.dal.order.ExpressInfoMapper;
 import com.yohoufo.dal.order.model.ExpressInfo;
 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;
 import com.yohoufo.order.mq.TopicConstants;
-import com.yohoufo.order.service.impl.AppraiseService;
 import com.yohoufo.order.service.impl.BuyerOrderCancelService;
 import com.yohoufo.order.service.proxy.OrderOperateRecordService;
 import com.yohoufo.order.utils.LoggerUtils;

@@ -3,8 +3,6 @@ package com.yohoufo.order.service.handler;
 import com.google.common.eventbus.Subscribe;
 import com.yohoufo.common.alarm.IEventHandler;
 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;
-import com.yohoufo.order.mq.DelayTime;
-import com.yohoufo.order.mq.TopicConstants;
 import com.yohoufo.order.mq.producer.TradeMqSender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,9 +24,11 @@ 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("Subscribe Buyer Order Cancel ShamDelivery Event do nothing ,event {}", event);
 
-        tradeMqSender.send(TopicConstants.BUYER_ORDER_CANCEL_SHAM_DELIVER, event, minutes);
+        //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);
     }
 }

@@ -24,7 +24,6 @@ import com.yohoufo.dal.order.*;
 import com.yohoufo.dal.order.model.*;
 import com.yohoufo.order.common.ExpressForMqSend;
 import com.yohoufo.order.constants.MetaKey;
-import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;
 import com.yohoufo.order.event.BuyerOrderSellerDeliveryCheckEvent;
 import com.yohoufo.order.event.ErpBuyerOrderEvent;
 import com.yohoufo.order.model.response.AppraiseAddressResp;
@@ -195,8 +194,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             EventBusPublisher.publishEvent(sellerDeliveryCheckEvent);
 
             //虚假发货的mq
-            BuyerOrderCancelShamDeliveryEvent shamDeliveryEvent = BuyerOrderCancelShamDeliveryEvent.builder().uid(buyerUid).orderCode(orderCode).build();
-            EventBusPublisher.publishEvent(shamDeliveryEvent);
+            //BuyerOrderCancelShamDeliveryEvent shamDeliveryEvent = BuyerOrderCancelShamDeliveryEvent.builder().uid(buyerUid).orderCode(orderCode).build();
+            //EventBusPublisher.publishEvent(shamDeliveryEvent);
 
             //
             cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),

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

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