剩余时间

@@ -91,6 +91,10 @@ public abstract class AbsOrderViewService {
             leftTime = deliverLeftTime;
         }
 
+        if (leftTime != null && leftTime<0){
+            leftTime = 0;
+        }
+
         return leftTime;
     }
 

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
 import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
+import com.yohobuy.ufo.model.order.bo.OrderInfo;
 import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
 import com.yohobuy.ufo.model.order.common.*;
 import com.yohobuy.ufo.model.order.constants.OrderConstant;
@@ -310,8 +311,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
         orderDetailInfo.setUid(order.getUid());
         orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order));
+
+
         Integer storageNum = sellerOrderGoods.getNum();
-        List<ButtonShowBo> buttons = getButtons(ViewType.DETAIL, storageNum, sellerType, order.getPayment(), skupStatus);
+
+        Integer leftTime = calLeftTime(OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime());
+
+        List<ButtonShowBo> buttons = getButtons(ViewType.DETAIL, storageNum, sellerType, order.getPayment(), skupStatus, leftTime);
         orderDetailInfo.setButtons(buttons);
         orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
         orderDetailInfo.setUserAddress(addressInfo);