conflict-feat-20240112-001-main #69

Merged
chenhao merged 8 commits from conflict-feat-20240112-001-main into main 2024-01-23 18:02:57 +08:00
2 changed files with 6 additions and 1 deletions
Showing only changes of commit f91231f5b3 - Show all commits

View File

@ -2027,7 +2027,7 @@ func (v *Vas) UnlockMembership(ctx *gin.Context, mid int64, product *dbstruct.Pr
Mid: goproto.Int64(mid),
ProductId: goproto.String(productId),
Ct: goproto.Int64(timeNow),
Means: goproto.String(dbstruct.UserVasUnlockMeansMoney),
Means: goproto.String(dbstruct.UserVasUnlockMembershipMeansMoney),
OrderId: order.ID,
}
err = v.store.CreateUserVasMembershipUnlock(ctx, tx, userVasMembershipUnlock)

View File

@ -614,6 +614,11 @@ const (
UserVasUnlockMeansMoney = "money" // 现金解锁
)
const (
UserVasUnlockMembershipMeansCoins = "coins" // 金币解锁
UserVasUnlockMembershipMeansMoney = "money" // 现金解锁
)
type UserVasUnlock struct {
Id *int64 `json:"id" db:"id"`
Mid *int64 `json:"mid" db:"mid"`