diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java index 111a7cb..4e476f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java @@ -33,9 +33,9 @@ public class WxApi { @GetMapping("/getCodeUrl") @Anonymous - public Map getCodeUrl(String userType) { + public Map getCodeUrl(String userType,String url) { Map res = new HashMap<>(); - res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType)); + res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/"+url, userType)); return res; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java index 12129c0..3ca7ce7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java @@ -67,7 +67,7 @@ public interface IMemberUserService extends IService { * @author vinjor-M * @date 15:55 2025/3/26 **/ - String wxLogin(String openid, String decryptResult); + String wxLogin(String openid, String decryptResult,String unionId); /** * uniApp保存会员信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index dc2fa33..2f3e8de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -160,7 +160,7 @@ public class MemberUserServiceImpl extends ServiceImpl