|
|
|
@@ -328,17 +328,17 @@ public class WxOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到支付订单"); |
|
|
|
} |
|
|
|
if(EnumPayStatus.PAY_STATUS_WAIT.getCode().equals(byObj.getPayOrderStatus())){ |
|
|
|
WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(payOrder.getComposeOrder()).getComposeOrder(payOrder.getOrderId(), payOrder.getTenantId()); |
|
|
|
WxComposeOrder composeOrder = orderFactory.getOrderAdapterService(byObj.getComposeOrder()).getComposeOrder(byObj.getOrderId(), byObj.getTenantId()); |
|
|
|
|
|
|
|
WxAppinfo appInfo = wxAppinfoService.getCAppInfo(payOrder, EnumPayWay.getEnum(payOrder.getPayVendor()).getPlat()); |
|
|
|
WxAppinfo appInfo = wxAppinfoService.getCAppInfo(byObj, EnumPayWay.getEnum(byObj.getPayVendor()).getPlat()); |
|
|
|
//WxCUser user = getUser(); |
|
|
|
//WxAppinfo appInfo = getAppInfo(user.getAppId()); |
|
|
|
if (null == appInfo) { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "当前支付类型["+payOrder.getPayVendor()+"]找不到C端appInfo"); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "当前支付类型["+byObj.getPayVendor()+"]找不到C端appInfo"); |
|
|
|
} |
|
|
|
WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); |
|
|
|
try { |
|
|
|
WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(payOrder, composeOrder,appInfo, payAccount, IdWorker.get(),false); |
|
|
|
WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(byObj, composeOrder,appInfo, payAccount, IdWorker.get(),false); |
|
|
|
if (null != wo) { |
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
map.put("outOrderNo",orderId); |
|
|
|
@@ -353,11 +353,11 @@ public class WxOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_QUERY_ERROR.getCode(), "订单"+EnumPayStatus.getEnum(payOrder.getPayOrderStatus()).getMessage()); |
|
|
|
} |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage(),e); |
|
|
|
logger.error("支付状态更新失败2: " + orderId + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + payOrder.toString() + ", e:" + e.getMessage()); |
|
|
|
logger.error("支付状态更新失败3: " + orderId + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付状态更新失败3: " + orderId + ", e:" + e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|