From 36ae49ef4e4696d7c74321c0b9a8674ec584571b Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 13 Aug 2024 14:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A6=96=E6=AC=A1=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E4=BB=B7=E6=A0=BC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/SystemMember.go | 5 ++---
 api/dto/OrderMember.go         | 2 +-
 api/dto/SystemMember.go        | 3 +++
 api/model/SystemMember.go      | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/api/controller/SystemMember.go b/api/controller/SystemMember.go
index 432d467..6276ed2 100644
--- a/api/controller/SystemMember.go
+++ b/api/controller/SystemMember.go
@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"hepa-calc-api/api/dao"
 	"hepa-calc-api/api/dto"
@@ -27,9 +26,9 @@ func (b *SystemMember) GetSystemMember(c *gin.Context) {
 	// 检测用户是否购买过会员
 	userService := service.UserService{}
 	isBuy := userService.CheckUserBuyMember(userId)
-	if isBuy == true {
+	if isBuy == false {
 		for _, member := range systemMembers {
-			fmt.Println(member)
+			member.FirstTimePrice = nil
 		}
 	}
 
diff --git a/api/dto/OrderMember.go b/api/dto/OrderMember.go
index 5443632..7e7f1c8 100644
--- a/api/dto/OrderMember.go
+++ b/api/dto/OrderMember.go
@@ -58,7 +58,7 @@ type OrderMemberRecentListDto struct {
 	UserId         string          `json:"user_id"`          // 用户id
 	SystemMemberId string          `json:"system_member_id"` // 会员id
 	CreatedAt      model.LocalTime `json:"created_at"`       // 创建时间
-	UserName       string          `json:"user_name"`        // 用户id
+	UserName       string          `json:"user_name"`        // 用户名称
 	MemberDays     uint            `json:"member_days"`      // 会员天数
 	TimeDesc       string          `json:"time_desc"`        // 时间描述
 }
diff --git a/api/dto/SystemMember.go b/api/dto/SystemMember.go
index 8c5b3fe..6e2c020 100644
--- a/api/dto/SystemMember.go
+++ b/api/dto/SystemMember.go
@@ -12,6 +12,7 @@ type SystemMemberDto struct {
 	Price           float64          `json:"price"`             // 价格（原价）
 	DiscountPrice   *float64         `json:"discount_price"`    // 优惠价格
 	DiscountEndTime *model.LocalTime `json:"discount_end_time"` // 优惠截止时间
+	FirstTimePrice  *float64         `json:"first_time_price"`  // 首次购买价格
 	CreatedAt       model.LocalTime  `json:"created_at"`        // 创建时间
 	UpdatedAt       model.LocalTime  `json:"updated_at"`        // 更新时间
 }
@@ -29,6 +30,7 @@ func GetSystemMemberListDto(m []*model.SystemMember) []*SystemMemberDto {
 				Price:           v.Price,
 				DiscountPrice:   v.DiscountPrice,
 				DiscountEndTime: v.DiscountEndTime,
+				FirstTimePrice:  v.FirstTimePrice,
 				CreatedAt:       v.CreatedAt,
 				UpdatedAt:       v.UpdatedAt,
 			}
@@ -49,6 +51,7 @@ func GetSystemMemberDto(m *model.SystemMember) *SystemMemberDto {
 		Price:           m.Price,
 		DiscountPrice:   m.DiscountPrice,
 		DiscountEndTime: m.DiscountEndTime,
+		FirstTimePrice:  m.FirstTimePrice,
 		CreatedAt:       m.CreatedAt,
 		UpdatedAt:       m.UpdatedAt,
 	}
diff --git a/api/model/SystemMember.go b/api/model/SystemMember.go
index da3e14a..49f6154 100644
--- a/api/model/SystemMember.go
+++ b/api/model/SystemMember.go
@@ -13,6 +13,7 @@ type SystemMember struct {
 	Price           float64    `gorm:"column:price;type:decimal(10,2);default:0.00;comment:价格（原价）" json:"price"`
 	DiscountPrice   *float64   `gorm:"column:discount_price;type:decimal(10,2);comment:优惠价格" json:"discount_price"`
 	DiscountEndTime *LocalTime `gorm:"column:discount_end_time;type:datetime;comment:优惠截止时间" json:"discount_end_time"`
+	FirstTimePrice  *float64   `gorm:"column:first_time_price;type:decimal(10,2);comment:首次购买价格" json:"first_time_price"`
 	Model
 }