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

nnnn

Browse Source
This commit is contained in:
777
2025-11-29 22:03:35 +08:00
parent 52ea057ea1
commit cfd23f2ca3
8 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ public class PayController {
}
}
if(checkOpen){
boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY);
boolean openAliPay = trdPayManager.checkOpenWx();
if(!openAliPay){
orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启");
return R.fail(600,"微信支付失败！未开启微信通道！");
@@ -274,7 +274,7 @@ public class PayController {
}
@PostMapping(value = "/wx")
/*@PostMapping(value = "/wx")
@Operation(summary = "微信支付")
@Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = true)
public R<PayReturnResp> appPay(@RequestBody PayControllerDTO dto) {
@@ -335,7 +335,7 @@ public class PayController {
resp.setData(jsonStr);
orderLogsService.createBaseSuccess(dto.getOrderNo(),"微信支付");
return R.ok(resp);
}
}*/
// @PostMapping(value = "/ali")
// @Operation(summary = "支付宝支付")

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
View File

@@ -59,7 +59,7 @@ public class SettingAppController {
SettingGoodsVo vo = new SettingGoodsVo();
if(useTrdPay){ // 使用第三方支付
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
vo.setHasWechatPay(trdPayManager.checkOpenWxInt());
}else{
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
View File

@@ -98,7 +98,7 @@ public class UserAppController {
boolean useTrdPay = trdPayManager.useTrdPay(LoginHelper.getUserId());
if(useTrdPay){ // 使用第三方支付
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
vo.setHasWechatPay(trdPayManager.checkOpenWxInt());
}else{
vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY));
vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));