shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

33333333333

Browse Source
This commit is contained in:
777
2025-04-04 10:40:45 +08:00
parent 6d8833736d
commit ba2d569737
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
View File

@@ -96,11 +96,26 @@ public class PayController {
return R.fail(600,"支付失败，未找到订单"); return R.fail(600,"支付失败，未找到订单");
} }
try { try {
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); boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY);
if(!openAliPay){ if(!openAliPay){
orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启"); orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启");
return R.fail(600,"微信支付失败！未开启微信通道！"); return R.fail(600,"微信支付失败！未开启微信通道！");
} }
}
log.info("微信聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto)); log.info("微信聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto));
PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo,true); PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo,true);
return R.ok(orderAli); return R.ok(orderAli);

5
ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV12Service.java
View File

@@ -102,11 +102,12 @@ public class PayTrdV12Service implements PayTrdService {
String createOrderUrl = gatewayUrl + type.getCreateOrderUrl(); String createOrderUrl = gatewayUrl + type.getCreateOrderUrl();
JSONObject responseJson = sandPayClient.execute(createOrderUrl, bizData); JSONObject responseJson = sandPayClient.execute(createOrderUrl, bizData);
if(responseJson == null || !"accept".equals(responseJson.getString("resultStatus"))){ 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)); log.info("第三方支付失败 V12 统一支付失败失败 url={} params={} body={}, payTrdConfig={}", createOrderUrl, JSON.toJSONString(bizData), JSON.toJSONString(responseJson), JSON.toJSONString(payTrdConfig));
throw new ServiceException("调用支付失败"); throw new ServiceException("调用支付失败");
}else{ }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")); return PayReturnResp.createDesan(responseJson.getString("cashierUrl"));
} }