Authored by qinchao

Revert "测试环境的 mq 时间修改 ,测试完之后需要revert"

This reverts commit eb98d8aa.
@@ -3,7 +3,6 @@ package com.yohoufo.order.controller; @@ -3,7 +3,6 @@ package com.yohoufo.order.controller;
3 import com.yohoufo.common.ApiResponse; 3 import com.yohoufo.common.ApiResponse;
4 import com.yohoufo.order.model.response.AssetsResp; 4 import com.yohoufo.order.model.response.AssetsResp;
5 import com.yohoufo.order.service.impl.AssetsService; 5 import com.yohoufo.order.service.impl.AssetsService;
6 -import com.yohoufo.order.service.quartz.PreSaleOrderJob;  
7 import org.slf4j.Logger; 6 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
9 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,22 +21,6 @@ public class AssetsController { @@ -22,22 +21,6 @@ public class AssetsController {
22 @Autowired 21 @Autowired
23 private AssetsService assetsService; 22 private AssetsService assetsService;
24 23
25 - @Autowired  
26 - private PreSaleOrderJob preSaleOrderJob;  
27 -  
28 -  
29 - /**  
30 - * 测试环境,定时任务手动触发  
31 - * 测试完之后去掉  
32 - * @return  
33 - */  
34 - @RequestMapping(params = "method=ufo.qc.test")  
35 - @ResponseBody  
36 - public ApiResponse getAssetsDetails(){  
37 - logger.info("in ufo.qc.test");  
38 - preSaleOrderJob.process("");  
39 - return new ApiResponse.ApiResponseBuilder().code(200).data(null).message("ok").build();  
40 - }  
41 24
42 25
43 @RequestMapping(params = "method=ufo.asssets.details") 26 @RequestMapping(params = "method=ufo.asssets.details")
@@ -31,7 +31,6 @@ public class BuyerMiniFaultOuterTimeHandler implements IEventHandler<BuyerMiniFa @@ -31,7 +31,6 @@ public class BuyerMiniFaultOuterTimeHandler implements IEventHandler<BuyerMiniFa
31 @Subscribe 31 @Subscribe
32 public void handle(BuyerMiniFaultOuterTimeEvent event) { 32 public void handle(BuyerMiniFaultOuterTimeEvent event) {
33 int minutes = DelayTime.MINI_FAULT_CONFIRM_OUTER_TIME_MINUTE; 33 int minutes = DelayTime.MINI_FAULT_CONFIRM_OUTER_TIME_MINUTE;
34 - minutes = 15;  
35 logger.info("Subscribe Buyer mini fault delay msg, event {},minutes {}", event,minutes); 34 logger.info("Subscribe Buyer mini fault delay msg, event {},minutes {}", event,minutes);
36 35
37 tradeMqSender.send(TopicConstants.BUYER_ORDER_MINI_FAULT_AUTO_REJECT, event,minutes ); 36 tradeMqSender.send(TopicConstants.BUYER_ORDER_MINI_FAULT_AUTO_REJECT, event,minutes );
@@ -40,7 +40,6 @@ public class SellerCancelDeliverHandler implements IEventHandler<SellerCancelDel @@ -40,7 +40,6 @@ public class SellerCancelDeliverHandler implements IEventHandler<SellerCancelDel
40 public void handle(SellerCancelDeliverEvent event) { 40 public void handle(SellerCancelDeliverEvent event) {
41 int ts = DateUtil.getCurrentTimeSecond(); 41 int ts = DateUtil.getCurrentTimeSecond();
42 int minutes = deliveryMinutesService.getDeliverMinutesThird(ts); 42 int minutes = deliveryMinutesService.getDeliverMinutesThird(ts);
43 - minutes = 20;  
44 String topic = TopicConstants.SELLER_ORDER_AUTO_CANCEL_DELIVER; 43 String topic = TopicConstants.SELLER_ORDER_AUTO_CANCEL_DELIVER;
45 logger.info("Subscribe Buyer Confirm delay msg,topic {}, delay minutes {} , event {}",topic,minutes, event); 44 logger.info("Subscribe Buyer Confirm delay msg,topic {}, delay minutes {} , event {}",topic,minutes, event);
46 45
@@ -23,7 +23,7 @@ consumer: @@ -23,7 +23,7 @@ consumer:
23 - class: com.yohoufo.order.mq.consumer.BuyerOrderMiniFaultOuterTimeDelayMsgConsumer 23 - class: com.yohoufo.order.mq.consumer.BuyerOrderMiniFaultOuterTimeDelayMsgConsumer
24 topic: buyerOrder.miniFaultAutoReject 24 topic: buyerOrder.miniFaultAutoReject
25 delay: 25 delay:
26 - interval: 15 26 + interval: 2880
27 27
28 #卖家物流揽收情况检查 24小时 28 #卖家物流揽收情况检查 24小时
29 - class: com.yohoufo.order.mq.consumer.BuyerOrderSellerDeliveryCheckMsgConsumer 29 - class: com.yohoufo.order.mq.consumer.BuyerOrderSellerDeliveryCheckMsgConsumer
@@ -56,7 +56,7 @@ consumer: @@ -56,7 +56,7 @@ consumer:
56 - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer 56 - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
57 topic: sellerOrder.autoCancelDeliver 57 topic: sellerOrder.autoCancelDeliver
58 delay: 58 delay:
59 - interval: 20 59 + interval: 2160
60 60
61 # 平台鉴定不能确定补发优惠券回调 61 # 平台鉴定不能确定补发优惠券回调
62 - class: com.yohoufo.order.mq.consumer.BuyerCouponSendResultForAppraiseUnsureConsumer 62 - class: com.yohoufo.order.mq.consumer.BuyerCouponSendResultForAppraiseUnsureConsumer