wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'by Robin at 20240122; fix' (#65) from feat-20240121-001-Robin into test 

Reviewed-on: #65
This commit is contained in:
chenhao 2024-01-22 17:17:04 +08:00
parent 75fc8d2611 9c42b763d8
commit b1262d838a
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/proto/account/proto/account_vo_api.go
View File

@ -16,6 +16,7 @@ type ApiListVO struct {
GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量 GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量
DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量 DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量
WithdrawDiamondNum *int64 `json:"withdraw_diamond_num" bson:"withdraw_diamond_num"` // 提现钻石数量 WithdrawDiamondNum *int64 `json:"withdraw_diamond_num" bson:"withdraw_diamond_num"` // 提现钻石数量
IsAMember *int64 `json:"is_a_member" bson:"is_a_member"` // 是否会员
Ct *int64 `json:"ct" bson:"ct"` // 创建时间 Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间 Ut *int64 `json:"ut" bson:"ut"` // 更新时间
} }
@ -45,6 +46,7 @@ func (vo *ApiListVO) CopyAccount(account *dbstruct.Account) *ApiListVO {
vo.IsDndModeEnabled = account.IsDndModeEnabled vo.IsDndModeEnabled = account.IsDndModeEnabled
vo.GoldNum = account.GoldNum vo.GoldNum = account.GoldNum
vo.DiamondNum = account.DiamondNum vo.DiamondNum = account.DiamondNum
vo.IsAMember = account.IsAMember
vo.Ct = account.Ct vo.Ct = account.Ct
vo.Ut = account.Ut vo.Ut = account.Ut
return vo return vo

2
api/proto/account/proto/account_vo_op.go
View File

@ -15,6 +15,7 @@ type OpListVO struct {
IsDndModeEnabled *int64 `json:"is_dnd_mode_enabled" bson:"is_dnd_mode_enabled"` // 是否开启勿扰模式 IsDndModeEnabled *int64 `json:"is_dnd_mode_enabled" bson:"is_dnd_mode_enabled"` // 是否开启勿扰模式
GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量 GoldNum *int64 `json:"gold_num" bson:"gold_num"` // 金币数量
DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量 DiamondNum *int64 `json:"diamond_num" bson:"diamond_num"` // 钻石数量
IsAMember *int64 `json:"is_a_member" bson:"is_a_member"` // 是否会员
Ct *int64 `json:"ct" bson:"ct"` // 创建时间 Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间 Ut *int64 `json:"ut" bson:"ut"` // 更新时间
} }
@ -44,6 +45,7 @@ func (vo *OpListVO) CopyAccount(account *dbstruct.Account) *OpListVO {
vo.IsDndModeEnabled = account.IsDndModeEnabled vo.IsDndModeEnabled = account.IsDndModeEnabled
vo.GoldNum = account.GoldNum vo.GoldNum = account.GoldNum
vo.DiamondNum = account.DiamondNum vo.DiamondNum = account.DiamondNum
vo.IsAMember = account.IsAMember
vo.Ct = account.Ct vo.Ct = account.Ct
vo.Ut = account.Ut vo.Ut = account.Ut
return vo return vo

2
app/mix/service/logic/vas.go
View File

@ -2043,7 +2043,7 @@ func (v *Vas) UnlockMembership(ctx *gin.Context, mid int64, product *dbstruct.Pr
OfficialDias = int64(0) OfficialDias = int64(0)
) )
if inviterMid > 0 { if inviterMid > 0 {
InviterDias = int64(float64(TotalDias) * 0.05) InviterDias = int64(float64(TotalDias) * 0.8)
} }
OfficialDias = TotalDias - InviterDias OfficialDias = TotalDias - InviterDias