...
|
...
|
@@ -148,7 +148,8 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO |
|
|
.orElse(null);
|
|
|
}
|
|
|
|
|
|
private String formatDetailDesc(BuyerOrder buyerOrder, String temp){
|
|
|
private String formatDetailDesc(BuyerOrder buyerOrder, String temp, SkupType skupType){
|
|
|
|
|
|
|
|
|
String detailDesc = temp;
|
|
|
Integer orderStatus = buyerOrder.getStatus();
|
...
|
...
|
@@ -172,6 +173,11 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO |
|
|
BuyerOrderStatusFlow statusFlow = buyerOrderStatusFlowMapper.selectByStatus(buyerOrder.getOrderCode(), orderStatus);
|
|
|
detailDesc = String.format(temp, BuyerOrderStatusFlow.formatRemarkWithPrefixAndSuffix(statusFlow));
|
|
|
}
|
|
|
else if (orderStatus == OrderStatus.SELLER_SEND_OUT.getCode()){
|
|
|
// 一般默认卖家72小时发货 只有极速默认24小时
|
|
|
detailDesc = String.format(temp, skupType == SkupType.FAST_DELIVERY ? 24 :72);
|
|
|
}
|
|
|
|
|
|
|
|
|
}catch (Exception ex){
|
|
|
getLogger().warn("in formatDetailDesc error buyerOrder {} temp {}", buyerOrder, temp, ex);
|
...
|
...
|
@@ -186,7 +192,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO |
|
|
.statuStr(orderStatus.getStatusStr(tabType))
|
|
|
.build();
|
|
|
OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
|
|
|
String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType, oa));
|
|
|
String detailDesc = formatDetailDesc(buyerOrder, orderStatus.getDetailDesc(tabType, oa), skupType);
|
|
|
statusDetail.setDetailDesc(detailDesc);
|
|
|
|
|
|
// 待付款时,剩余时间
|
...
|
...
|
|