From bdab2ad8f3ae37a62b742b8d15de789f454f6367 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Mon, 25 Nov 2024 20:54:47 +0800
Subject: [PATCH] 123

---
 .../cai/admin/init/CityController.java        |  1 -
 .../controller/cai/app/UserAppController.java | 20 ++++++++++++++++++-
 .../cai/dto/app/vo/user/MemberInfoVo.java     |  4 ++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
index 4f5aed31..f55b9c8f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/init/CityController.java
@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.cai.admin.init;
 
 
 import com.alibaba.fastjson2.JSONObject;
-import com.dtflys.forest.annotation.JSONBody;
 import com.ruoyi.cai.pay.PayOrderInfoDTO;
 import com.ruoyi.cai.pay.PayReturnResp;
 import com.ruoyi.cai.service.CitysService;
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 5620a74e..b373c555 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
@@ -10,15 +10,19 @@ import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet;
 import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq;
 import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
 import com.ruoyi.cai.dto.app.vo.UserCallAppVo;
+import com.ruoyi.cai.dto.app.vo.setting.SettingGoodsVo;
 import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo;
 import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
 import com.ruoyi.cai.dto.app.vo.user.UserAlbumAuditVo;
 import com.ruoyi.cai.dto.app.vo.user.UserAvatarMinVo;
+import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.manager.CurrentUserManager;
+import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.service.UserAlbumService;
 import com.ruoyi.cai.service.UserCallService;
 import com.ruoyi.cai.service.UserMemberService;
 import com.ruoyi.cai.service.UserOnlineService;
+import com.ruoyi.cai.trdpay.TrdPayManager;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
@@ -75,6 +79,11 @@ public class UserAppController {
         return R.ok(currentUserManager.currentUpdateInfo());
     }
 
+    @Autowired
+    private TrdPayManager trdPayManager;
+    @Autowired
+    private SystemConfigManager systemConfigManager;
+
     @GetMapping("/member")
     @Operation(summary = "当前会员信息")
     @Log(title = "当前会员信息", businessType = BusinessType.OTHER, isSaveDb = false)
@@ -85,7 +94,16 @@ public class UserAppController {
         }else if(type != 0 && type != 1){
             type = 0;
         }
-        return R.ok(userMemberService.memberApp(userId,type));
+        MemberInfoVo vo = userMemberService.memberApp(userId, type);
+        boolean useTrdPay = trdPayManager.useTrdPay(LoginHelper.getUserId());
+        if(useTrdPay){ // 使用第三方支付
+            vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
+            vo.setHasWechatPay(0);
+        }else{
+            vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY));
+            vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY));
+        }
+        return R.ok(vo);
     }
 
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java
index 6f829265..65c9edcf 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java
@@ -27,6 +27,10 @@ public class MemberInfoVo {
     private String expireTimeStr;
     @Schema(description = "是否开通会员")
     private Integer on;
+    @Schema(description = "是否显示支付宝支付 1-显示 0-隐藏")
+    private Integer hasAlipayPay = 1;
+    @Schema(description = "是否显示支付宝支付 1-显示 0-隐藏")
+    private Integer hasWechatPay = 1;
 
     private String bannerPic = "images/member/vip_banner.gif";