From 0b76e4a123ebc67d083bd1bd11baa31624c7686c Mon Sep 17 00:00:00 2001
From: 777 <123@qwe.com>
Date: Sun, 19 Jan 2025 17:54:13 +0800
Subject: [PATCH] 33333333333

---
 .../java/com/ruoyi/web/controller/cai/app/OtherController.java | 3 +++
 .../java/com/ruoyi/web/controller/cai/app/PayController.java   | 1 +
 .../com/ruoyi/web/controller/cai/app/SettingAppController.java | 2 +-
 .../com/ruoyi/web/controller/cai/app/UserAppController.java    | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java
index bda5c4f8..2b607544 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/OtherController.java
@@ -14,6 +14,7 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/api/other")
 @Tag(name = "其他接口")
+@Slf4j
 public class OtherController {
 
     @Autowired
@@ -54,6 +56,7 @@ public class OtherController {
     @Operation(summary = "版本号校验")
     @Log(title = "版本号校验", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false)
     public R<VersionSystemInfo> systemVersion(){
+        log.info("版本号校验获取参数 version={} platform={}", VersionUtil.getAppVersion(), VersionUtil.getVersionPlatform());
         VersionSystemInfo info = versionService.systemInfo(VersionUtil.getAppVersion(), VersionUtil.getVersionPlatform());
         return R.ok(info);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
index b96b7324..d88850e4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
@@ -16,6 +16,7 @@ import com.ijpay.wxpay.WxPayApi;
 import com.ijpay.wxpay.model.UnifiedOrderModel;
 import com.ruoyi.cai.domain.OrderLogs;
 import com.ruoyi.cai.domain.PayConfig;
+import com.ruoyi.cai.domain.PayTrdConfig;
 import com.ruoyi.cai.dto.app.vo.pay.OrderPayStatusResp;
 import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.SystemConfigManager;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
index 6e4155fe..05c98b9c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java
@@ -59,7 +59,7 @@ public class SettingAppController {
         SettingGoodsVo vo = new SettingGoodsVo();
         if(useTrdPay){ // 使用第三方支付
             vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
-            vo.setHasWechatPay(0);
+            vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
         }else{
             vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY));
             vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
index 9ee116e4..0dc3bf14 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java
@@ -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(0);
+            vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
         }else{
             vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY));
             vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));