|
|
|
@@ -485,7 +485,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
|
|
|
|
//支付失败,更新record,支付成功,则调用 |
|
|
|
if (payResult.isSuccess()) { |
|
|
|
handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),record,user, appInfo, params); |
|
|
|
handleMicroOrderPaySuccess(payResult.getData(), payResult.getTransactionId(),payWay,record,user, appInfo, params); |
|
|
|
return new ResultData(Result.SUCCESS, "创建支付订单成功", payResult.getData()); |
|
|
|
}else { |
|
|
|
try { |
|
|
|
@@ -552,7 +552,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
handleOrderPaySuccess(record, apiResult.getTransactionId()); |
|
|
|
//C端被动支付 |
|
|
|
}else if (payService instanceof CPassivePayService) { |
|
|
|
handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(), record,user,appInfo,null); |
|
|
|
handleMicroOrderPaySuccess(apiResult.getData(),apiResult.getTransactionId(),payWay, record,user,appInfo,null); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "success",apiResult.getData()); |
|
|
|
}else if (status == EnumPayStatus.PAY_STATUS_ORDER_NOT_EXISTS.getCode().intValue()) { |
|
|
|
@@ -1094,11 +1094,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void handleMicroOrderPaySuccess(Object result,String transcationId, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) { |
|
|
|
public void handleMicroOrderPaySuccess(Object result,String transcationId,EnumPayWay payWay, WxPayOrder record ,WxMerchantBUser user,WxAppinfo appInfo,PayExtraParam params) { |
|
|
|
//B端操作,需要生成cUser |
|
|
|
Long cUserId; |
|
|
|
try { |
|
|
|
cUserId = payServiceFactory.getCPassivePayService(1).createCUserAfterPay(result, appInfo); |
|
|
|
cUserId = payServiceFactory.getCPassivePayService(payWay.getCode()).createCUserAfterPay(result, appInfo); |
|
|
|
} catch (Exception e1) { |
|
|
|
logger.error("创建C端用户失败: " ,e1); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "创建C端用户失败: " + e1.getMessage()); |
|
|
|
|