上线测试更改BUG

LiangZhiYUMao/pages/index/index.vue

@@ -291,6 +291,7 @@
 			this.loadBannerData()
 			this.loadNoticeData()
 			this.loadFunctionGridData()
+			this.checkMatchmakerStatusFromDB()
 			// this.loadTodayRecommend()
 			this.loadCharmIndex()
 			this.loadHotActivities()
@@ -337,7 +338,8 @@
 						this.showMatchmakerButton = (isMatchmaker === 1)
 						
 						// 同时更新本地存储的用户信息
-						const userInfo = uni.getStorageSync('userInfo') || {}
+						const userInfo = await api.user.getDetailInfo(userId)
+						console.log(userInfo)
 						userInfo.isMatchmaker = isMatchmaker
 						uni.setStorageSync('userInfo', userInfo)
 						this.userInfo.isMatchmaker = isMatchmaker
@@ -701,6 +703,14 @@ async loadFunctionGridData() {
 
 			// 跳转到VIP页面
 			goToVip() {
+				const status = uni.getStorageSync("userInfo").status
+					if(status != 1){
+						uni.showToast({
+							title: '您的账户违反规定已被禁用',
+							icon: 'none'
+						})
+						return
+					}
 				uni.navigateTo({
 					url: '/pages/vip/index'
 				})
@@ -708,6 +718,14 @@ async loadFunctionGridData() {
 
 			// 跳转到活动列表
 			goToActivityList() {
+				const status = uni.getStorageSync("userInfo").status
+				if(status != 1){
+					uni.showToast({
+						title: '您的账户违反规定已被禁用',
+						icon: 'none'
+					})
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/activities/list'
 				})
@@ -715,6 +733,14 @@ async loadFunctionGridData() {
 
 			// 处理活动点击
 			handleActivityClick(activity) {
+				const status = uni.getStorageSync("userInfo").status
+				if(status != 1){
+					uni.showToast({
+						title: '您的账户违反规定已被禁用',
+						icon: 'none'
+					})
+					return
+				}
 				uni.navigateTo({
 					url: `/pages/activities/detail?id=${activity.id}`
 				})
@@ -722,6 +748,14 @@ async loadFunctionGridData() {
 
 			// 跳转到成功案例列表
 			goToSuccessCaseList() {
+				const status = uni.getStorageSync("userInfo").status
+				if(status != 1){
+					uni.showToast({
+						title: '您的账户违反规定已被禁用',
+						icon: 'none'
+					})
+					return
+				}
 				uni.navigateTo({
 					url: '/pages/success-case/list'
 				})

service/Essential/src/main/java/com/zhentao/service/impl/UserServiceImpl.java

@@ -62,6 +62,7 @@ public class UserServiceImpl implements UserService {
         vo.setBirthDate(user.getBirthDate());
         vo.setAge(calculateAge(user.getBirthDate()));
         vo.setIsMatchmaker(user.getIsMatchmaker());
+        vo.setStatus(user.getStatus());
         
         // 如果有扩展信息
         if (profile != null) {

service/Essential/src/main/java/com/zhentao/vo/UserInfoVO.java

@@ -195,5 +195,6 @@ public class UserInfoVO {
      * 地区ID
      */
     private Integer areaId;
+    private Integer status;
 }
 

service/Recommend/src/main/java/com/zhentao/service/impl/RecommendServiceImpl.java

@@ -1,29 +1,23 @@
 package com.zhentao.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zhentao.config.RecommendProps;
+import com.zhentao.dto.UserSearchQuery;
 import com.zhentao.mapper.RecommendMapper;
 import com.zhentao.mapper.UsersMapper;
 import com.zhentao.pojo.Users;
 import com.zhentao.service.RecommendService;
 import com.zhentao.vo.RecommendUserVO;
-import com.zhentao.dto.UserSearchQuery;
-import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
 @Service
 public class RecommendServiceImpl implements RecommendService {
 
@@ -479,7 +473,7 @@ public class RecommendServiceImpl implements RecommendService {
             limit = 20;
         }
         if (offset == null || offset < 0) {
-            offset = 0;
+            offset = 1;
         }
         try {
             return recommendMapper.selectLikedUsers(userId, offset, limit);

service/Recommend/src/main/resources/mapper/RecommendMapper.xml

@@ -568,6 +568,7 @@
     <select id="selectLikedUsers" resultMap="RecommendUserMap">
         <![CDATA[
         SELECT DISTINCT
+            ulu.create_time,
           u.user_id,
           u.nickname,
           u.gender,

service/login/src/main/java/com/zhentao/controller/AuthCodeController.java

@@ -147,8 +147,7 @@ public class AuthCodeController {
         
         // 根据openid查询用户
         Users user = usersService.getOne(new LambdaQueryWrapper<Users>()
-                .eq(Users::getWechatOpenid, openid)
-                .eq(Users::getStatus, 1), false);
+                .eq(Users::getWechatOpenid, openid));
         
         // 如果用户不存在，创建新用户
         if (user == null) {