修正了增加用户会员过期时间计算。增加了单项订单支付成功后,有效时间的维护
This commit is contained in:
parent
b2c1f0ee44
commit
ddd3f57bdf
@ -86,6 +86,22 @@ func (r *CallBack) WxPaySingle(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
orderSingleData["escrow_trade_no"] = transaction.TransactionId
|
orderSingleData["escrow_trade_no"] = transaction.TransactionId
|
||||||
orderSingleData["updated_at"] = time.Now().Format("2006-01-02 15:04:05")
|
orderSingleData["updated_at"] = time.Now().Format("2006-01-02 15:04:05")
|
||||||
|
|
||||||
|
// 处理单项有效时间
|
||||||
|
if *wxPayResult.PayStatus == 2 {
|
||||||
|
systemSingleDao := dao.SystemSingleDao{}
|
||||||
|
|
||||||
|
maps := make(map[string]interface{})
|
||||||
|
systemSingle, err := systemSingleDao.GetSystemSingle(maps)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"code": "ERROR", "message": err})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
orderSingleData["valid_date"] = time.Now().Add(time.Duration(systemSingle.ValidDays) * 24 * time.Hour)
|
||||||
|
}
|
||||||
|
|
||||||
err = orderSingleDao.EditOrderSingleById(tx, orderSingle.OrderId, orderSingleData)
|
err = orderSingleDao.EditOrderSingleById(tx, orderSingle.OrderId, orderSingleData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
|
|||||||
@ -116,9 +116,6 @@ func (r *Question) GetQuestion(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取问题被购买数量
|
|
||||||
buyCount, _ := questionService.GetQuestionBuyCount(userId, questionId)
|
|
||||||
|
|
||||||
g := dto.GetQuestionDto(question)
|
g := dto.GetQuestionDto(question)
|
||||||
|
|
||||||
// 加载数据-是否收藏
|
// 加载数据-是否收藏
|
||||||
@ -127,6 +124,9 @@ func (r *Question) GetQuestion(c *gin.Context) {
|
|||||||
// 加载数据-首次购买价格
|
// 加载数据-首次购买价格
|
||||||
g.LoadFirstTimePrice(firstTimePrice)
|
g.LoadFirstTimePrice(firstTimePrice)
|
||||||
|
|
||||||
|
// 获取问题被购买数量
|
||||||
|
buyCount, _ := questionService.GetQuestionBuyCount(userId, questionId)
|
||||||
|
|
||||||
// 加载数据-问题被购买数量
|
// 加载数据-问题被购买数量
|
||||||
g.LoadBuyCount(buyCount)
|
g.LoadBuyCount(buyCount)
|
||||||
|
|
||||||
|
|||||||
@ -107,12 +107,13 @@ func (r *UserService) AddUserMemberValidDate(tx *gorm.DB, user *model.User, d in
|
|||||||
userData["is_member"] = 1
|
userData["is_member"] = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var t time.Time
|
||||||
if user.MemberExpireDate == nil {
|
if user.MemberExpireDate == nil {
|
||||||
userData["is_member"] = time.Now().Format("2006-01-02 15:04:05")
|
t = time.Now()
|
||||||
} else {
|
} else {
|
||||||
t := time.Time(*user.MemberExpireDate)
|
t = time.Time(*user.MemberExpireDate)
|
||||||
userData["is_member"] = t.Add(time.Duration(d) * 24 * time.Hour)
|
|
||||||
}
|
}
|
||||||
|
userData["is_member"] = t.Add(time.Duration(d) * 24 * time.Hour)
|
||||||
|
|
||||||
userDao := dao.UserDao{}
|
userDao := dao.UserDao{}
|
||||||
err := userDao.EditUserById(tx, user.UserId, userData)
|
err := userDao.EditUserById(tx, user.UserId, userData)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user