ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 479e4b1d164e158fc48bf4eb3530a403b8356fd9 2 parents 88ef8e97 674ba5a3

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

Inline Side-by-side
Showing 1 changed file with 6 additions and 3 deletions
@@ -173,13 +173,16 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -173,13 +173,16 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
173 return false; 173 return false;
174 } 174 }
175 175
176 - final static List<Integer> canRefundStatusList = Arrays.asList(OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),  
177 - OrderStatus.SEND_OUT_TIMEOUT.getCode(), OrderStatus.CHECKING_FAKE.getCode(), 176 + final static List<Integer> canRefundStatusList = Arrays.asList(
  177 + OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
  178 + OrderStatus.SEND_OUT_TIMEOUT.getCode(),
  179 + OrderStatus.CHECKING_FAKE.getCode(),
178 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(), 180 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
179 OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(), 181 OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(),
180 // 支付成功回调超时，但已经被超时取消，这种场景是可以退款的 182 // 支付成功回调超时，但已经被超时取消，这种场景是可以退款的
181 OrderStatus.BUYER_CANCEL_TIMEOUT.getCode(), 183 OrderStatus.BUYER_CANCEL_TIMEOUT.getCode(),
182 - OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode()); 184 + OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode(),
  185 + OrderStatus.CS_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
183 186
184 @Override 187 @Override
185 public boolean canRefund(OrderInfo orderInfo) { 188 public boolean canRefund(OrderInfo orderInfo) {