fix

@@ -48,6 +48,9 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
     @Autowired
     protected OrdersPayService ordersPayService;
 
+    @Autowired
+    private DeliveryMinutesService deliveryMinutesService;
+
     abstract BuyerOrder getBuyerOrder(int uid, long orderCode);
 
     abstract BuyerOrderMeta getBuyerOrderMeta(int uid, long orderCode, String metaKey);
@@ -109,7 +112,8 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
 
         if(orderStatus.getCode() == OrderStatus.HAS_PAYED.getCode() || orderStatus.getCode() == OrderStatus.SEND_OUT_TIMEOUT.getCode()){
             TimeoutBo timeoutBo = ordersPayService.getDeliverLeftTime(uid, orderCode);
-            if(timeoutBo!=null && timeoutBo.getTimelimit() != DelayTime.MINUTES_36_HOURS * 60 ){
+            if(timeoutBo!=null && timeoutBo.getTimelimit().intValue() != DelayTime.MINUTES_36_HOURS * 60
+                    && timeoutBo.getStartTime()!=null && timeoutBo.getStartTime().intValue()>=deliveryMinutesService.getOnlineTime()){
                 logger.info("getOrderDetail resetDescForSeller , uid is {}, buyerUid {} orderCode is {}", uid,
                         buyerUid, orderCode);
                 OrderStatus.resetDescForSeller(orderStatus);

@@ -7,6 +7,8 @@ import com.yohoufo.dal.order.OrdersPayMapper;
 import com.yohoufo.dal.order.model.OrdersPay;
 import com.yohoufo.order.mq.DelayTime;
 import com.yohoufo.order.service.proxy.DeliveryMinutesService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,7 +17,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class OrdersPayService {
-
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private OrdersPayMapper ordersPayMapper;
 
@@ -34,9 +36,12 @@ public class OrdersPayService {
 
         //订单的支付时间如果大于上线时间，则120小时算，否则还是36小时
         int timelimit;
-        if(createTime.intValue()>=deliveryMinutesService.getOnlineTime()){
+        int onLineTime = deliveryMinutesService.getOnlineTime();
+        if(createTime.intValue()>=onLineTime){
+            logger.info("OrdersPayService createTime bigger than online time ,set 120 hours ,orderCode {},createTime {} ,onLineTime {}",orderCode,createTime,onLineTime);
             timelimit = deliveryMinutesService.getDeliverMinutesThird()* 60;
         }else{
+            logger.info("OrdersPayService createTime smaller than online time ,set 36 hours ,orderCode {},createTime {} ,onLineTime {}",orderCode,createTime,onLineTime);
             timelimit = DelayTime.MINUTES_36_HOURS * 60;
         }
         //int timelimit = DelayTime.MINUTES_36_HOURS * 60;

@@ -14,4 +14,6 @@ ufo.order.realDesc             = \u9274\u5b9a\u7ed3\u679c\uff1a\u771f
 #二次发货提醒 108*60 minutes
 ufo.order.sellerDeliverNoticeSecond = 6480
 #发货失败提醒 120*60 minutes
-ufo.order.sellerDeliverNoticeThird = 7200
\ No newline at end of file
+ufo.order.sellerDeliverNoticeThird = 7200
+#新的发货上线时间  20190129 18:00:00
+ufo.order.sellerDeliverNewOnlineTime = 1548756000
\ No newline at end of file

@@ -17,5 +17,5 @@ ufo.order.appressVideoShow     = true
 ufo.order.sellerDeliverNoticeSecond = 6480
 #发货失败提醒 120*60 minutes
 ufo.order.sellerDeliverNoticeThird = 7200
-#新的发货上线时间
-ufo.order.sellerDeliverNewOnlineTime = 1548741553
\ No newline at end of file
+#新的发货上线时间  20190129 18:00:00
+ufo.order.sellerDeliverNewOnlineTime = 1548756000
\ No newline at end of file