From 5e5d07cb5b69626048ced05abc24b268e82d8dfe Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 4 Sep 2024 09:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=80=E5=B0=91=E7=AB=8B?=
 =?UTF-8?q?=E5=87=8F=E9=87=91=E9=A2=9D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/SystemMember.go | 14 +++++++++++++-
 api/service/User.go            |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/api/controller/SystemMember.go b/api/controller/SystemMember.go
index 626d97f..1c9fd3d 100644
--- a/api/controller/SystemMember.go
+++ b/api/controller/SystemMember.go
@@ -40,6 +40,19 @@ func (b *SystemMember) GetSystemMember(c *gin.Context) {
 
 // GetSystemMemberLeast 获取会员配置数据-最少立减金额
 func (b *SystemMember) GetSystemMemberLeast(c *gin.Context) {
+	var firstTimePrice *float64
+
+	// 检测用户是否购买过会员
+	userId := c.GetInt64("UserId")
+	if userId != 0 {
+		userService := service.UserService{}
+		isBuy := userService.CheckUserBuyMember(userId)
+		if isBuy == true {
+			responses.OkWithData(firstTimePrice, c)
+			return
+		}
+	}
+
 	systemMemberDao := dao.SystemMemberDao{}
 
 	maps := make(map[string]interface{})
@@ -49,7 +62,6 @@ func (b *SystemMember) GetSystemMemberLeast(c *gin.Context) {
 		return
 	}
 
-	var firstTimePrice *float64
 	for _, member := range systemMembers {
 		if member.FirstTimePrice == nil {
 			continue
diff --git a/api/service/User.go b/api/service/User.go
index 9eda6d4..54f6903 100644
--- a/api/service/User.go
+++ b/api/service/User.go
@@ -733,6 +733,7 @@ func (r *UserService) PutUser(userId int64, req requests.PutUser) (bool, error)
 	if req.NationId != "" {
 		if userInfo.NationId != nil {
 			nationId := fmt.Sprintf("%d", *userInfo.NationId)
+			fmt.Println(req.NationId)
 			if req.NationId != nationId {
 				userInfoData["nation_id"] = req.NationId