...
|
...
|
@@ -100,7 +100,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
|
|
|
private static final List<Long> SELLER_TYPES = Arrays.asList(OrderCodeType.SELLER_TYPE.getType());
|
|
|
|
|
|
|
|
|
private static final List<Integer> quickDeliverFinishStatus ;
|
|
|
static {
|
|
|
quickDeliverFinishStatus = new ArrayList<>(8);
|
|
|
quickDeliverFinishStatus.add(OrderStatus.JUDGE_PASS.getCode());
|
|
|
quickDeliverFinishStatus.add(OrderStatus.DONE.getCode());
|
|
|
}
|
|
|
@Override
|
|
|
public OrderDetailInfo getOrderDetail(OrderRequest orderRequest) {
|
|
|
int uid;
|
...
|
...
|
@@ -493,12 +498,16 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I |
|
|
buyerOrder.getOrderCode(), detailDesc, orderOverTime);
|
|
|
}
|
|
|
}
|
|
|
if (BuyerOrderUtils.isQuickDeliverDeposit(skupType, buyerOrder)) {
|
|
|
detailDesc = OrderDetailDesc.Seller.TRADE_DONE_QUICK_DELIVER;
|
|
|
//急速发货商品,且已完成(区分寄存 发货)
|
|
|
if (SellerGoodsHelper.isQuickDeliver(skupType)) {
|
|
|
if (quickDeliverFinishStatus.contains(orderStatus.getCode())){
|
|
|
detailDesc = OrderDetailDesc.Seller.TRADE_DONE_QUICK_DELIVER;
|
|
|
}
|
|
|
}
|
|
|
return detailDesc;
|
|
|
}
|
|
|
|
|
|
|
|
|
@Override
|
|
|
protected void resetDynamicProporties(OrderDetailInfo orderDetailInfo,String appVersion) {
|
|
|
Long orderCode = orderDetailInfo.getOrderCode();
|
...
|
...
|
|