gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了关联时间字段

Browse Source
This commit is contained in:
admin
2024-08-08 17:24:02 +08:00
parent fc835fbc6d
commit b2c1f0ee44
25 changed files with 141 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/controller/Login.go
+8 -2
View File
@@ -82,9 +82,12 @@ func (r *Login) LoginPhone(c *gin.Context) {
Avatar: avatar,
IsMember: 0,
MemberExpireDate: nil,
LoginAt: model.LocalTime(time.Now()),
LoginIp: loginIp,
}
loginAt := model.LocalTime(time.Now())
user.LoginAt = &loginAt
user, err := userDao.AddUser(tx, user)
if err != nil {
tx.Rollback()
@@ -195,9 +198,12 @@ func (r *Login) LoginWx(c *gin.Context) {
Avatar: avatar,
IsMember: 0,
MemberExpireDate: nil,
LoginAt: model.LocalTime(time.Now()),
LoginIp: loginIp,
}
loginAt := model.LocalTime(time.Now())
user.LoginAt = &loginAt
user, err = userDao.AddUser(tx, user)
if err != nil {
tx.Rollback()
api/controller/OrderMember.go
+2 -17
View File
@@ -248,14 +248,6 @@ func (b *OrderMember) GetOrderMemberPayStatus(c *gin.Context) {
// 处理有效期
if g.PayStatus == 2 {
// 获取单项配置
systemMemberDao := dao.SystemMemberDao{}
systemMember, err := systemMemberDao.GetSystemMemberById(orderMember.SystemMemberId)
if err != nil {
responses.FailWithMessage("内部错误", c)
return
}
// 获取用户数据
userDao := dao.UserDao{}
user, err := userDao.GetUserById(orderMember.UserId)
@@ -264,17 +256,10 @@ func (b *OrderMember) GetOrderMemberPayStatus(c *gin.Context) {
return
}
// 获取有效期
var validTime time.Time
if user.MemberExpireDate != nil {
validTime = user.MemberExpireDate.Add(time.Duration(systemMember.MemberDays) * 24 * time.Hour)
} else {
now := time.Now()
validTime = now.Add(time.Duration(systemMember.MemberDays) * 24 * time.Hour)
// 加载到期时间
g.LoadValidDate(user.MemberExpireDate)
}
// 加载到期时间
g.LoadValidDate(&validTime)
}
responses.OkWithData(g, c)
api/controller/OrderSingle.go
-19
View File
@@ -367,24 +367,5 @@ func (b *OrderSingle) GetOrderSinglePayStatus(c *gin.Context) {
// 处理返回值
g := dto.GetOrderSinglePayStatus(orderSingle)
// 处理有效期
if g.PayStatus == 2 {
// 获取单项配置
systemSingleDao := dao.SystemSingleDao{}
maps = make(map[string]interface{})
systemSingle, err := systemSingleDao.GetSystemSingle(maps)
if err != nil {
responses.FailWithMessage("内部错误", c)
return
}
// 获取有效期
validTime := orderSingle.PayTime.Add(time.Duration(systemSingle.ValidDays) * 24 * time.Hour)
// 加载到期时间
g.LoadValidDate(&validTime)
}
responses.OkWithData(g, c)
}
api/controller/Question.go
+5 -4
View File
@@ -133,8 +133,8 @@ func (r *Question) GetQuestion(c *gin.Context) {
responses.OkWithData(g, c)
}
// GetQuestionBuyStatus 获取问题购买状态
func (r *Question) GetQuestionBuyStatus(c *gin.Context) {
// GetQuestionUnlockStatus 获取问题解锁状态
func (r *Question) GetQuestionUnlockStatus(c *gin.Context) {
// 购买状态（0:否 1:是）
var status int
userId := c.GetInt64("UserId")
@@ -228,9 +228,10 @@ func (r *Question) GetQuestionBuyStatus(c *gin.Context) {
}
// 判断是否还在有效期内
payTime := time.Time(*single.PayTime)
validTime := payTime.Add(time.Duration(systemSingle.ValidDays) * 24 * time.Hour)
now := time.Now()
ValidTime := single.PayTime.Add(time.Duration(systemSingle.ValidDays) * 24 * time.Hour)
if ValidTime.Before(now) {
if validTime.Before(now) {
continue
}