Merge branch 'dev_order' into test6.8.2

chenchao
Commit 853219a2dabb70aab5e71107e562e5eb698b056e 2 parents 5e3338ce d2f4dabe
Showing 1 changed file with 3 additions and 1 deletions
order/src/main/java/com/yohoufo/order/service/BuyerOrderPaymentService.java
--- a/order/src/main/java/com/yohoufo/order/service/BuyerOrderPaymentService.java
View file @853219a
+++ b/order/src/main/java/com/yohoufo/order/service/BuyerOrderPaymentService.java
View file @853219a
@@ -145,7 +145,9 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
     }
 
     final static List<Integer> canRefundStatusList = Arrays.asList(OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
-             OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode());
+             OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode(),
+             OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
+             OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode());
 
     @Override
     public boolean canRefund(OrderInfo orderInfo) {