...
|
...
|
@@ -371,10 +371,19 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
.statuStr(orderStatus.getStatusStr(tabType))
|
|
|
.detailDesc(orderStatus.getDetailDesc(tabType))
|
|
|
.build();
|
|
|
Integer deliverLeftTime = getDeliverLeftTime(buyerOrder.getUid(), buyerOrder.getOrderCode(), buyerOrder.getStatus());
|
|
|
if (deliverLeftTime != null){
|
|
|
statusDetail.setLeftTime(deliverLeftTime);
|
|
|
if(orderStatus == OrderStatus.HAS_PAYED){
|
|
|
Integer deliverLeftTime = getDeliverLeftTime(buyerOrder.getUid(), buyerOrder.getOrderCode(), buyerOrder.getStatus());
|
|
|
if (deliverLeftTime != null){
|
|
|
statusDetail.setLeftTime(deliverLeftTime);
|
|
|
}
|
|
|
}
|
|
|
if(orderStatus == OrderStatus.WAITING_PAY){
|
|
|
Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
|
|
|
if (Objects.nonNull(leftTime)){
|
|
|
statusDetail.setLeftTime(leftTime);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if(ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){
|
|
|
statusDetail.setExpressShow(true);
|
|
|
}
|
...
|
...
|
|