...
|
...
|
@@ -411,14 +411,27 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
Long orderCode = orderDetailInfo.getOrderCode();
|
|
|
CodeMeta codeMeta = orderCode == null ? null : orderCodeGenerator.expId(orderCode);
|
|
|
//TabType tabType = TabType.SELL;
|
|
|
Integer orderStatus = orderDetailInfo.getStatusDetail().getStatus();
|
|
|
Integer orderStatus = null;
|
|
|
if (codeMeta!=null) {
|
|
|
|
|
|
Integer buyerUid=null;
|
|
|
Integer createTime = null;
|
|
|
OrderCodeType orderCodeType = OrderCodeType.getOrderCodeType(codeMeta.getType());
|
|
|
if(orderCodeType.getType() == OrderCodeType.BUYER_TYPE.getType()){
|
|
|
BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
|
|
|
buyerUid = buyerOrder.getUid();
|
|
|
orderStatus = buyerOrder.getStatus();
|
|
|
createTime=buyerOrder.getCreateTime();
|
|
|
}else{
|
|
|
orderStatus = orderDetailInfo.getStatusDetail().getStatus();
|
|
|
createTime = orderDetailInfo.getSecendLevelCreateTime();
|
|
|
}
|
|
|
//Integer leftTime = getPayLeftTime4Seller(orderCodeType, orderStatus, orderDetailInfo.getSecendLevelCreateTime());
|
|
|
TimeoutBo timeoutBo = new SellerOrderTimeoutWrapper().createTime(orderDetailInfo.getSecendLevelCreateTime())
|
|
|
TimeoutBo timeoutBo = calTimeout(TabType.SELL, buyerUid, orderCode, orderStatus, createTime);
|
|
|
/*TimeoutBo timeoutBo = new SellerOrderTimeoutWrapper().createTime(orderDetailInfo.getSecendLevelCreateTime())
|
|
|
.orderCodeType(orderCodeType)
|
|
|
.orderStatus(orderStatus)
|
|
|
.calculatePayLeftTime();
|
|
|
.calculatePayLeftTime();*/
|
|
|
Integer leftTime = timeoutBo.getLeftTime();
|
|
|
orderDetailInfo.getStatusDetail().setLeftTime(leftTime);
|
|
|
|
...
|
...
|
|