|
|
|
@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.exception.PayPlatOrderNotExistsException; |
|
|
|
import com.iformall.service.WxAppinfoService; |
|
|
|
import com.iformall.service.WxOrderService; |
|
|
|
import com.iformall.service.WxPayOrderService; |
|
|
|
@@ -322,17 +323,21 @@ public class OrderExpiringSchedule { |
|
|
|
} |
|
|
|
//Map<String, String> retMap = WxPayOrderServiceHelper.wxOrderPayStatusMap(wxpayOrder, order, appInfo, payAccount); |
|
|
|
//int status = WxPayOrderServiceHelper.getPayStatusFromMap(retMap, wxpayOrder.getPayOrderNo()); |
|
|
|
PayQueryAdapterResult payResult = payServiceFactory.getPayAdapterService(wxpayOrder.getPayVendor(),payAccount.getPayVersion()).queryPayStatus(wxpayOrder, appInfo, payAccount); |
|
|
|
//如果是支付成功,并且需要重试成功流程, |
|
|
|
if (EnumPayStatus.PAY_STATUS_SUCCESS.getCode().intValue() == payResult.getCode()) { |
|
|
|
if (autoReHandle) { |
|
|
|
WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(wxpayOrder.getComposeOrder()).getComposeOrder(wxpayOrder.getOrderId(), wxpayOrder.getTenantId()); |
|
|
|
//无论是不是批量的,都是执行单个订单 |
|
|
|
composeOrder.setSingleOrder(order); |
|
|
|
wxPayOrderService.handleSuccessOrder(wxpayOrder, composeOrder, payResult, true,true); |
|
|
|
} |
|
|
|
return true; |
|
|
|
} |
|
|
|
try { |
|
|
|
PayQueryAdapterResult payResult = payServiceFactory.getPayAdapterService(wxpayOrder.getPayVendor(),payAccount.getPayVersion()).queryPayStatus(wxpayOrder, appInfo, payAccount); |
|
|
|
//如果是支付成功,并且需要重试成功流程, |
|
|
|
if (EnumPayStatus.PAY_STATUS_SUCCESS.getCode().intValue() == payResult.getCode()) { |
|
|
|
if (autoReHandle) { |
|
|
|
WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(wxpayOrder.getComposeOrder()).getComposeOrder(wxpayOrder.getOrderId(), wxpayOrder.getTenantId()); |
|
|
|
//无论是不是批量的,都是执行单个订单 |
|
|
|
composeOrder.setSingleOrder(order); |
|
|
|
wxPayOrderService.handleSuccessOrder(wxpayOrder, composeOrder, payResult, true,true); |
|
|
|
} |
|
|
|
return true; |
|
|
|
} |
|
|
|
}catch(PayPlatOrderNotExistsException pe) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
|