ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 49519390c6b2c778530b5788eedefb9437fc4305 1 parent fac5125a

fix seller see buyer waiting pay left time

Inline Side-by-side
Showing 1 changed file with 12 additions and 3 deletions
@@ -371,10 +371,19 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -371,10 +371,19 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
371 .statuStr(orderStatus.getStatusStr(tabType)) 371 .statuStr(orderStatus.getStatusStr(tabType))
372 .detailDesc(orderStatus.getDetailDesc(tabType)) 372 .detailDesc(orderStatus.getDetailDesc(tabType))
373 .build(); 373 .build();
374 - Integer deliverLeftTime = getDeliverLeftTime(buyerOrder.getUid(), buyerOrder.getOrderCode(), buyerOrder.getStatus());  
375 - if (deliverLeftTime != null){  
376 - statusDetail.setLeftTime(deliverLeftTime); 374 + if(orderStatus == OrderStatus.HAS_PAYED){
  375 + Integer deliverLeftTime = getDeliverLeftTime(buyerOrder.getUid(), buyerOrder.getOrderCode(), buyerOrder.getStatus());
  376 + if (deliverLeftTime != null){
  377 + statusDetail.setLeftTime(deliverLeftTime);
  378 + }
  379 + }
  380 + if(orderStatus == OrderStatus.WAITING_PAY){
  381 + Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
  382 + if (Objects.nonNull(leftTime)){
  383 + statusDetail.setLeftTime(leftTime);
  384 + }
377 } 385 }
  386 +
378 if(ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){ 387 if(ActionStatusHold.getSellerShowExpressStatusList().contains(orderStatus.getCode())){
379 statusDetail.setExpressShow(true); 388 statusDetail.setExpressShow(true);
380 } 389 }