From d7e060ed1c26126f8b3bda43b53e3269392aac67 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Tue, 6 May 2025 14:41:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java             | 2 +-
 .../java/com/ruoyi/member/controller/MemberUserController.java | 1 +
 .../com/ruoyi/member/service/impl/MemberUserServiceImpl.java   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

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 133457f..de910c8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
@@ -64,7 +64,7 @@ public class WxApi {
         String token = weChatUtils.getToken();
         Map<String, Object> map = new HashMap<>();
         map.put("path", path);
-        map.put("query", "noticeId="+query);
+        map.put("query", "noticeId="+query+"&navigatePath=index");
         map.put("expire_type", 1);
         map.put("expire_interval", 30);
         String post = HttpUtil.post("https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + token, com.alibaba.fastjson2.JSONObject.toJSONString(map));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
index 9b4d4a6..b538a13 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java
@@ -2,6 +2,7 @@ package com.ruoyi.member.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
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 c608a83..02b2a81 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
@@ -39,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 会员Service业务层处理
@@ -341,6 +342,6 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
     public Object isGetGift() {
         Long userId = SecurityUtils.getUserId();
         MemberUserVO result = memberUserMapper.queryByUserId(userId, "02");
-        return result.getIsGetGift();
+        return Optional.ofNullable(result.getIsGetGift()).orElse("0");
     }
 }