Merge branch 'master' into test6.8.3

@@ -6,7 +6,8 @@ public enum ClientType {
     IPHONE(3, "iphone"),
     ANDROID(4, "android"),
     IPAD(5, "ipad"),
-    H5(6, "h5");
+    H5(6, "h5"),
+    MINIAPP(7, "miniapp");
 
     int code;
 

@@ -9,10 +9,12 @@ public interface DelayTime {
     int MINUTES_7_DAYS = 24 * 60 * 7;
 
 
-    int MINUTES_15_MIN = 15;
+    int BUYER_ORDER_WAITING_PAY = 10;
 
     int MINUTES_36_HOURS = 36*60;
 
 
     int MINUTES_24_HOURS = 24*60;
+
+    int SELLER_ORDER_WAITING_PAY = 15;
 }

@@ -19,7 +19,6 @@ public class BuyerOrderCancelAsyncHandler implements IEventHandler<BuyerCancelEv
 
     final Logger logger = LoggerFactory.getLogger(getClass());
 
-    public static final int DELAY_MINUTES_15_MIN = DelayTime.MINUTES_15_MIN ;
 
     @Autowired
     private TradeMqSender tradeMqSender;
@@ -29,6 +28,6 @@ public class BuyerOrderCancelAsyncHandler implements IEventHandler<BuyerCancelEv
     public void handle(BuyerCancelEvent event) {
         logger.info("Subscribe Buyer timeout cancel delay msg, event {}", event);
 
-        tradeMqSender.send(TopicConstants.BUYER_ORDER_AUTO_CANCEL, event, DELAY_MINUTES_15_MIN);
+        tradeMqSender.send(TopicConstants.BUYER_ORDER_AUTO_CANCEL, event, DelayTime.BUYER_ORDER_WAITING_PAY);
     }
 }

@@ -21,6 +21,7 @@ import com.yohoufo.order.event.OrderCancelEvent;
 import com.yohoufo.order.model.PayRefundBo;
 import com.yohoufo.order.model.request.PaymentRequest;
 import com.yohoufo.order.model.request.TransferMoneyRequest;
+import com.yohoufo.order.mq.DelayTime;
 import com.yohoufo.order.mq.TopicConstants;
 import com.yohoufo.order.mq.producer.TradeMqSender;
 import com.yohoufo.order.service.cache.CacheCleaner;
@@ -483,7 +484,7 @@ public class SellerOrderCancelService {
         }
         if (SellerOrderStatus.WAITING_PAY.getCode() == status){
             //send msg to mq system
-            tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , 15);
+            tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , DelayTime.SELLER_ORDER_WAITING_PAY);
         }
     }
 

@@ -39,6 +39,7 @@ import com.yohoufo.order.model.request.OrderRequest;
 import com.yohoufo.order.model.response.OrderDetailInfo;
 import com.yohoufo.order.model.response.OrderSubmitResp;
 import com.yohoufo.order.model.response.OrderSummaryResp;
+import com.yohoufo.order.mq.DelayTime;
 import com.yohoufo.order.service.IOrderDetailService;
 import com.yohoufo.order.service.IOrderListService;
 import com.yohoufo.order.service.MerchantOrderPaymentService;
@@ -237,7 +238,7 @@ public class SellerOrderService  implements IOrderListService, IOrderDetailServi
         long orderCode = context.getOrderCode();
         log.info("seller order pushAutoCancelEvent, uid {}, orderCode {}", uid, orderCode);
         OrderCancelEvent orderCancelEvent = OrderCancelEvent.builder().uid(uid)
-                .orderCode(orderCode).payExpire(15)
+                .orderCode(orderCode).payExpire(DelayTime.SELLER_ORDER_WAITING_PAY)
                 .actorType(TabType.SELL).cancelType(CancelType.TIME_OUT).build();
         eventHandlerContainer.fireAsyncCancelEvent(orderCancelEvent);
     }

 package com.yohoufo.order.service.impl.visitor;
 
 import com.google.common.eventbus.Subscribe;
-import com.yohoufo.common.alarm.IEventHandler;
 import com.yohobuy.ufo.model.order.common.CancelType;
 import com.yohobuy.ufo.model.order.common.TabType;
+import com.yohoufo.common.alarm.IEventHandler;
 import com.yohoufo.order.event.OrderCancelEvent;
 import com.yohoufo.order.service.impl.SellerOrderCancelService;
 import com.yohoufo.order.utils.LoggerUtils;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

@@ -11,7 +11,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
               topic: buyerOrder.autoCancel
               delay:
-                    interval: 15
+                    interval: 10
 
             - class: com.yohoufo.order.mq.consumer.BuyerOrderConfirmDelayMsgConsumer
               topic: buyerOrder.autoConfirm
@@ -26,7 +26,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
               topic: order.notPaidNotice
               delay:
-                    interval: 10
+                    interval: 5
 
       #更新物流调拨信息
       - address: 192.168.102.45:5672

@@ -11,7 +11,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
               topic: buyerOrder.autoCancel
               delay:
-                    interval: 15
+                    interval: 10
 
             - class: com.yohoufo.order.mq.consumer.BuyerOrderConfirmDelayMsgConsumer
               topic: buyerOrder.autoConfirm
@@ -27,7 +27,7 @@ consumer:
             - class: com.yohoufo.order.mq.consumer.NotPaidNoticeDelayMsgConsumer
               topic: order.notPaidNotice
               delay:
-                    interval: 10
+                    interval: 5
 
             - class: com.yohoufo.order.mq.consumer.NotDeliverNoticeDelayMsgConsumer
               topic: order.notDeliver