48->36

@@ -77,7 +77,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
                 .uid(orderInfo.getSellerUid()).prdName(sellerOrderGoods.getProductName()).build();
                 .uid(orderInfo.getSellerUid()).prdName(sellerOrderGoods.getProductName()).build();
         EventBusPublisher.publishEvent(deliverNoticeEvent);
         EventBusPublisher.publishEvent(deliverNoticeEvent);
 
 
-        //卖家48小时不发货取消
+        //卖家36小时不发货取消
         SellerCancelDeliverEvent event = SellerCancelDeliverEvent.builder()
         SellerCancelDeliverEvent event = SellerCancelDeliverEvent.builder()
                 .uid(uid).sellerUid(orderInfo.getSellerUid()).skup(sellerOrderGoods.getId())
                 .uid(uid).sellerUid(orderInfo.getSellerUid()).skup(sellerOrderGoods.getId())
                 .orderCode(orderInfo.getOrderCode()).build();
                 .orderCode(orderInfo.getOrderCode()).build();

@@ -20,7 +20,7 @@ public class DeliverNoticeAsyncHandler implements IEventHandler<DeliverNoticeEve
 
 
     final Logger logger = LoggerFactory.getLogger(getClass());
     final Logger logger = LoggerFactory.getLogger(getClass());
 
 
-    public static final int DELAY_MINUTES_36_HOURS = 36*60;
+    public static final int DELAY_MINUTES_24_HOURS = 24*60;
 
 
     @Autowired
     @Autowired
     private TradeMqSender tradeMqSender;
     private TradeMqSender tradeMqSender;
@@ -30,6 +30,6 @@ public class DeliverNoticeAsyncHandler implements IEventHandler<DeliverNoticeEve
     @Subscribe
     @Subscribe
     public void handle(DeliverNoticeEvent event) {
     public void handle(DeliverNoticeEvent event) {
         logger.info("in DeliverNoticeAsyncHandler handler, msg {}", event);
         logger.info("in DeliverNoticeAsyncHandler handler, msg {}", event);
-        tradeMqSender.send(TopicConstants.ORDER_NOT_DELIVER_NOTICE, event, DELAY_MINUTES_36_HOURS);
+        tradeMqSender.send(TopicConstants.ORDER_NOT_DELIVER_NOTICE, event, DELAY_MINUTES_24_HOURS);
     }
     }
 }
 }

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class SellerCancelDeliverHandler implements IEventHandler<SellerCancelDeliverEvent> {
 public class SellerCancelDeliverHandler implements IEventHandler<SellerCancelDeliverEvent> {
 
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final Logger logger = LoggerFactory.getLogger(getClass());
-    public static final int DELAY_MINUTES_48_HOURS = 48 * 60 ;
+    public static final int DELAY_MINUTES_36_HOURS = 36 * 60 ;
 
 
     @Autowired
     @Autowired
     private TradeMqSender tradeMqSender;
     private TradeMqSender tradeMqSender;
@@ -27,6 +27,6 @@ public class SellerCancelDeliverHandler implements IEventHandler<SellerCancelDel
     public void handle(SellerCancelDeliverEvent event) {
     public void handle(SellerCancelDeliverEvent event) {
         logger.info("Subscribe Buyer Confirm delay msg, event {}", event);
         logger.info("Subscribe Buyer Confirm delay msg, event {}", event);
 
 
-        tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL_DELIVER, event, DELAY_MINUTES_48_HOURS);
+        tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL_DELIVER, event, DELAY_MINUTES_36_HOURS);
     }
     }
 }
 }

@@ -21,7 +21,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
             - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
               topic: sellerOrder.autoCancelDeliver
               topic: sellerOrder.autoCancelDeliver
               delay:
               delay:
-                    interval: 2880
+                    interval: 2160
 
 
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
               topic: order.notPaidNotice
               topic: order.notPaidNotice

@@ -21,7 +21,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
             - class: com.yohoufo.order.mq.consumer.SellerOrderCancelDeliverDelayMsgConsumer
               topic: sellerOrder.autoCancelDeliver
               topic: sellerOrder.autoCancelDeliver
               delay:
               delay:
-                    interval: 2880
+                    interval: 2160
 
 
             #order.notPaidNotice
             #order.notPaidNotice
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
@@ -32,7 +32,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.NotDeliverNoticeDelayMsgConsumer
             - class: com.yohoufo.order.mq.consumer.NotDeliverNoticeDelayMsgConsumer
               topic: order.notDeliver
               topic: order.notDeliver
               delay:
               delay:
-                    interval: 2160
+                    interval: 1440
 
 
 
 
       - address: ${rabbit_common}
       - address: ${rabbit_common}