ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit 7598db84fc90c5965f5cf6a765a1f68e730eacf4 2 parents 95d2344a 54e54413

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

Inline Side-by-side
Showing 5 changed files with 15 additions and 17 deletions
@@ -10,7 +10,6 @@ import com.yohoufo.dal.order.ExpressInfoMapper; @@ -10,7 +10,6 @@ import com.yohoufo.dal.order.ExpressInfoMapper;
10 import com.yohoufo.dal.order.model.ExpressInfo; 10 import com.yohoufo.dal.order.model.ExpressInfo;
11 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent; 11 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;
12 import com.yohoufo.order.mq.TopicConstants; 12 import com.yohoufo.order.mq.TopicConstants;
13 -import com.yohoufo.order.service.impl.AppraiseService;  
14 import com.yohoufo.order.service.impl.BuyerOrderCancelService; 13 import com.yohoufo.order.service.impl.BuyerOrderCancelService;
15 import com.yohoufo.order.service.proxy.OrderOperateRecordService; 14 import com.yohoufo.order.service.proxy.OrderOperateRecordService;
16 import com.yohoufo.order.utils.LoggerUtils; 15 import com.yohoufo.order.utils.LoggerUtils;
@@ -3,8 +3,6 @@ package com.yohoufo.order.service.handler; @@ -3,8 +3,6 @@ package com.yohoufo.order.service.handler;
3 import com.google.common.eventbus.Subscribe; 3 import com.google.common.eventbus.Subscribe;
4 import com.yohoufo.common.alarm.IEventHandler; 4 import com.yohoufo.common.alarm.IEventHandler;
5 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent; 5 import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;
6 -import com.yohoufo.order.mq.DelayTime;  
7 -import com.yohoufo.order.mq.TopicConstants;  
8 import com.yohoufo.order.mq.producer.TradeMqSender; 6 import com.yohoufo.order.mq.producer.TradeMqSender;
9 import org.slf4j.Logger; 7 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 8 import org.slf4j.LoggerFactory;
@@ -26,9 +24,11 @@ public class BuyerOrderCancelShamDeliveryHandler implements IEventHandler<BuyerO @@ -26,9 +24,11 @@ public class BuyerOrderCancelShamDeliveryHandler implements IEventHandler<BuyerO
26 @Override 24 @Override
27 @Subscribe 25 @Subscribe
28 public void handle(BuyerOrderCancelShamDeliveryEvent event) { 26 public void handle(BuyerOrderCancelShamDeliveryEvent event) {
29 - int minutes = DelayTime.CANCEL_SHAM_DELIVERY_TIME_MINUTE ;  
30 - logger.info("Subscribe Buyer Order Cancel ShamDelivery Event delay msg, minutes {} ,event {}", minutes ,event); 27 + logger.info("Subscribe Buyer Order Cancel ShamDelivery Event do nothing ,event {}", event);
31 28
32 - tradeMqSender.send(TopicConstants.BUYER_ORDER_CANCEL_SHAM_DELIVER, event, minutes); 29 + //int minutes = DelayTime.CANCEL_SHAM_DELIVERY_TIME_MINUTE ;
  30 + //logger.info("Subscribe Buyer Order Cancel ShamDelivery Event delay msg, minutes {} ,event {}", minutes ,event);
  31 +
  32 + //tradeMqSender.send(TopicConstants.BUYER_ORDER_CANCEL_SHAM_DELIVER, event, minutes);
33 } 33 }
34 } 34 }
@@ -24,7 +24,6 @@ import com.yohoufo.dal.order.*; @@ -24,7 +24,6 @@ import com.yohoufo.dal.order.*;
24 import com.yohoufo.dal.order.model.*; 24 import com.yohoufo.dal.order.model.*;
25 import com.yohoufo.order.common.ExpressForMqSend; 25 import com.yohoufo.order.common.ExpressForMqSend;
26 import com.yohoufo.order.constants.MetaKey; 26 import com.yohoufo.order.constants.MetaKey;
27 -import com.yohoufo.order.event.BuyerOrderCancelShamDeliveryEvent;  
28 import com.yohoufo.order.event.BuyerOrderSellerDeliveryCheckEvent; 27 import com.yohoufo.order.event.BuyerOrderSellerDeliveryCheckEvent;
29 import com.yohoufo.order.event.ErpBuyerOrderEvent; 28 import com.yohoufo.order.event.ErpBuyerOrderEvent;
30 import com.yohoufo.order.model.response.AppraiseAddressResp; 29 import com.yohoufo.order.model.response.AppraiseAddressResp;
@@ -195,8 +194,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -195,8 +194,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
195 EventBusPublisher.publishEvent(sellerDeliveryCheckEvent); 194 EventBusPublisher.publishEvent(sellerDeliveryCheckEvent);
196 195
197 //虚假发货的mq 196 //虚假发货的mq
198 - BuyerOrderCancelShamDeliveryEvent shamDeliveryEvent = BuyerOrderCancelShamDeliveryEvent.builder().uid(buyerUid).orderCode(orderCode).build();  
199 - EventBusPublisher.publishEvent(shamDeliveryEvent); 197 + //BuyerOrderCancelShamDeliveryEvent shamDeliveryEvent = BuyerOrderCancelShamDeliveryEvent.builder().uid(buyerUid).orderCode(orderCode).build();
  198 + //EventBusPublisher.publishEvent(shamDeliveryEvent);
200 199
201 // 200 //
202 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()), 201 cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),
@@ -29,10 +29,10 @@ consumer: @@ -29,10 +29,10 @@ consumer:
29 delay: 29 delay:
30 interval: 1440 30 interval: 1440
31 31
32 - - class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer  
33 - topic: buyerOrder.cancelShamDeliver  
34 - delay:  
35 - interval: 2880 32 + #- class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
  33 + # topic: buyerOrder.cancelShamDeliver
  34 + # delay:
  35 + # interval: 2880
36 36
37 - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer 37 - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
38 topic: order.notPaidNotice 38 topic: order.notPaidNotice
@@ -31,10 +31,10 @@ consumer: @@ -31,10 +31,10 @@ consumer:
31 delay: 31 delay:
32 interval: 1440 32 interval: 1440
33 33
34 - - class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer  
35 - topic: buyerOrder.cancelShamDeliver  
36 - delay:  
37 - interval: 2880 34 + #- class: com.yohoufo.order.mq.consumer.BuyerOrderCancelShamDeliveryMsgConsumer
  35 + # topic: buyerOrder.cancelShamDeliver
  36 + # delay:
  37 + # interval: 2880
38 38
39 #order.notPaidNotice 39 #order.notPaidNotice
40 - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer 40 - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer