ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 6237c5d50d3ffdf11e8e5a0c564e58f613330800 1 parent 48a06ec9

剩余时间

Inline Side-by-side
Showing 2 changed files with 11 additions and 1 deletions
@@ -91,6 +91,10 @@ public abstract class AbsOrderViewService { @@ -91,6 +91,10 @@ public abstract class AbsOrderViewService {
91 leftTime = deliverLeftTime; 91 leftTime = deliverLeftTime;
92 } 92 }
93 93
  94 + if (leftTime != null && leftTime<0){
  95 + leftTime = 0;
  96 + }
  97 +
94 return leftTime; 98 return leftTime;
95 } 99 }
96 100
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 import com.yoho.error.ServiceError; 4 import com.yoho.error.ServiceError;
5 import com.yoho.error.exception.ServiceException; 5 import com.yoho.error.exception.ServiceException;
6 import com.yohobuy.ufo.model.order.bo.ButtonShowBo; 6 import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
  7 +import com.yohobuy.ufo.model.order.bo.OrderInfo;
7 import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo; 8 import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
8 import com.yohobuy.ufo.model.order.common.*; 9 import com.yohobuy.ufo.model.order.common.*;
9 import com.yohobuy.ufo.model.order.constants.OrderConstant; 10 import com.yohobuy.ufo.model.order.constants.OrderConstant;
@@ -310,8 +311,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -310,8 +311,13 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
310 OrderDetailInfo orderDetailInfo = new OrderDetailInfo(); 311 OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
311 orderDetailInfo.setUid(order.getUid()); 312 orderDetailInfo.setUid(order.getUid());
312 orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order)); 313 orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order));
  314 +
  315 +
313 Integer storageNum = sellerOrderGoods.getNum(); 316 Integer storageNum = sellerOrderGoods.getNum();
314 - List<ButtonShowBo> buttons = getButtons(ViewType.DETAIL, storageNum, sellerType, order.getPayment(), skupStatus); 317 +
  318 + Integer leftTime = calLeftTime(OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime());
  319 +
  320 + List<ButtonShowBo> buttons = getButtons(ViewType.DETAIL, storageNum, sellerType, order.getPayment(), skupStatus, leftTime);
315 orderDetailInfo.setButtons(buttons); 321 orderDetailInfo.setButtons(buttons);
316 orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)); 322 orderDetailInfo.setSubmitOrderTimeStr(DateUtil.formatDate(order.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS));
317 orderDetailInfo.setUserAddress(addressInfo); 323 orderDetailInfo.setUserAddress(addressInfo);