33333333333
This commit is contained in:
@@ -96,10 +96,25 @@ public class PayController {
|
||||
return R.fail(600,"支付失败,未找到订单");
|
||||
}
|
||||
try {
|
||||
boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY);
|
||||
if(!openAliPay){
|
||||
orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启");
|
||||
return R.fail(600,"微信支付失败!未开启微信通道!");
|
||||
boolean checkOpen = true;
|
||||
String payCustom = systemConfigManager.getSystemConfig(SystemConfigEnum.PAY_CUSTOM);
|
||||
PayTrdConfig payTrdConfig = null;
|
||||
if(StringUtils.isNotEmpty(payCustom)){
|
||||
String[] ssss = payCustom.split(",");
|
||||
for (String vvvvv : ssss) {
|
||||
String[] payCustomSplit = vvvvv.split("-");
|
||||
if(payCustomSplit[0].equals(LoginHelper.getUserId()+"")){
|
||||
checkOpen = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(checkOpen){
|
||||
boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY);
|
||||
if(!openAliPay){
|
||||
orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启");
|
||||
return R.fail(600,"微信支付失败!未开启微信通道!");
|
||||
}
|
||||
}
|
||||
log.info("微信聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto));
|
||||
PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo,true);
|
||||
|
||||
@@ -102,11 +102,12 @@ public class PayTrdV12Service implements PayTrdService {
|
||||
String createOrderUrl = gatewayUrl + type.getCreateOrderUrl();
|
||||
JSONObject responseJson = sandPayClient.execute(createOrderUrl, bizData);
|
||||
if(responseJson == null || !"accept".equals(responseJson.getString("resultStatus"))){
|
||||
orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl+JSON.toJSONString(responseJson), com.alibaba.fastjson2.JSONObject.from(responseJson), false, type, getStepName(wx));
|
||||
orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl+JSON.toJSONString(bizData), com.alibaba.fastjson2.JSONObject.from(responseJson), false, type, getStepName(wx));
|
||||
log.info("第三方支付失败 V12 统一支付失败失败 url={} params={} body={}, payTrdConfig={}", createOrderUrl, JSON.toJSONString(bizData), JSON.toJSONString(responseJson), JSON.toJSONString(payTrdConfig));
|
||||
throw new ServiceException("调用支付失败");
|
||||
}else{
|
||||
orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl+JSON.toJSONString(responseJson), com.alibaba.fastjson2.JSONObject.from(responseJson), true, type, getStepName(wx));
|
||||
log.info("第三方支付成功 V12 url={} params={} body={}, payTrdConfig={}", createOrderUrl, JSON.toJSONString(bizData), JSON.toJSONString(responseJson), JSON.toJSONString(payTrdConfig));
|
||||
orderLogsService.createAliPayLogs(payOrderInfoDTO.getOrderNo(), createOrderUrl+JSON.toJSONString(bizData), com.alibaba.fastjson2.JSONObject.from(responseJson), true, type, getStepName(wx));
|
||||
}
|
||||
return PayReturnResp.createDesan(responseJson.getString("cashierUrl"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user