Authored by chenchao

Merge branch 'dev_order' into test6.8.2

@@ -145,7 +145,9 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -145,7 +145,9 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
145 } 145 }
146 146
147 final static List<Integer> canRefundStatusList = Arrays.asList(OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(), 147 final static List<Integer> canRefundStatusList = Arrays.asList(OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
148 - OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode()); 148 + OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode(),
  149 + OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
  150 + OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode());
149 151
150 @Override 152 @Override
151 public boolean canRefund(OrderInfo orderInfo) { 153 public boolean canRefund(OrderInfo orderInfo) {