ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit 5cc302cadbfe24c7a3a947c4f92027b9d1cad993 1 parent f47317e5

支付回调手动取消也退款

Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
... ... @@ -136,7 +136,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
* @return
*/
public boolean isTimeoutCancelStatus(OrderInfo orderInfo){
if (orderInfo.getStatus() != null && orderInfo.getStatus().intValue() == OrderStatus.BUYER_CANCEL_TIMEOUT.getCode()){
if (orderInfo.getStatus() != null &&
(orderInfo.getStatus().intValue() == OrderStatus.BUYER_CANCEL_TIMEOUT.getCode()) || orderInfo.getStatus().intValue() == OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode()){
return true;
}
... ...
... ... @@ -222,7 +222,8 @@ public class SellerOrderPaymentService extends AbstractOrderPaymentService {
@Override
public boolean isTimeoutCancelStatus(OrderInfo orderInfo) {
if (orderInfo.getStatus() != null && orderInfo.getStatus().intValue() == SellerOrderStatus.TIMEOUT_CANCEL.getCode()){
if (orderInfo.getStatus() != null &&
(orderInfo.getStatus().intValue() == SellerOrderStatus.TIMEOUT_CANCEL.getCode() || orderInfo.getStatus().intValue() == SellerOrderStatus.SELf_CANCEL_PAY.getCode())){
return true;
}
... ...