From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java b/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
index 4d8b212..f23b839 100644
--- a/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
+++ b/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
@@ -74,6 +74,34 @@
 		return status;
 	}
 
+//	/**
+//	 * 查询用户信息(包含用户基本信息及是否缴费/会员)
+//	 * @param userVip
+//	 * @return
+//	 */
+//	@Override
+//	public Object getUserVipInfo(UserVip userVip) {
+//		// 根据身份证号查询用户信息
+//		User user = new User();
+//		user.setCardid(userVip.getIdCardNo());
+//		user.setStatus(1);
+//		user.setIsDeleted(0);
+//		User user1 = userService.getOne(Condition.getQueryWrapper(user));
+//		if (null!=user1){
+//			UserVip userVip1 = new UserVip();
+//			userVip1.setUserId(user1.getId());
+//			UserVip vip = this.getOne(Condition.getQueryWrapper(userVip1));
+//			if (null!=vip){
+//				UserVipVO vipVO = new UserVipVO();
+//				vipVO.setIdCardNo(user1.getCardid());
+//				vipVO.setSex(user1.getSex());
+//				vipVO.setRealName(user1.getRealName());
+//				return vipVO;
+//			}
+//		}
+//		return null;
+//	}
+
 	/**
 	 * 查询用户信息(包含用户基本信息及是否缴费/会员)
 	 * @param userVip
@@ -81,24 +109,9 @@
 	 */
 	@Override
 	public Object getUserVipInfo(UserVip userVip) {
-		// 根据身份证号查询用户信息
-		User user = new User();
-		user.setCardid(userVip.getIdCardNo());
-		user.setStatus(1);
-		user.setIsDeleted(0);
-		User user1 = userService.getOne(Condition.getQueryWrapper(user));
-		if (null!=user1){
-			UserVip userVip1 = new UserVip();
-			userVip1.setUserId(user1.getId());
-			UserVip vip = this.getOne(Condition.getQueryWrapper(userVip1));
-			if (null!=vip){
-				UserVipVO vipVO = new UserVipVO();
-				vipVO.setIdCardNo(user1.getCardid());
-				vipVO.setSex(user1.getSex());
-				vipVO.setRealName(user1.getRealName());
-				return vipVO;
-			}
-		}
-		return null;
+		UserVip userVip1 = new UserVip();
+		userVip1.setUserId(Long.parseLong(userVip.getIdCardNo()));
+		//返回
+		return this.getOne(Condition.getQueryWrapper(userVip1));
 	}
 }

--
Gitblit v1.9.3