Authored by LUOXC

Merge branch 'dev6.8.5-cancelorder' into test6.8.5

... ... @@ -173,13 +173,16 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
return false;
}
final static List<Integer> canRefundStatusList = Arrays.asList(OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode(),
final static List<Integer> canRefundStatusList = Arrays.asList(
OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
OrderStatus.SEND_OUT_TIMEOUT.getCode(),
OrderStatus.CHECKING_FAKE.getCode(),
OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(),
// 支付成功回调超时,但已经被超时取消,这种场景是可以退款的
OrderStatus.BUYER_CANCEL_TIMEOUT.getCode(),
OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode());
OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode(),
OrderStatus.CS_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
@Override
public boolean canRefund(OrderInfo orderInfo) {
... ...