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

Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-23 17:12:51 +08:00
parent 89ad155d56 f901feadf7
commit 3b3d47eef6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,10 +610,20 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
case dbstruct.ProductIdContactWechat: case dbstruct.ProductIdContactWechat:
// 获取uid微信金币价格 // 获取uid微信金币价格
coinPrice = uVasInfo.WechatCoinPrice coinPrice = uVasInfo.WechatCoinPrice
if coinPrice <= 0 {
err = errs.ErrVasInvalidCoinPrice
logger.Warn("invalid coin price, mid: %v, uid: %v, contactProductId: %v, coinPrice: %v", mid, uid, contactProductId, coinPrice)
return
}
case dbstruct.ProductIdH5ContactWechat: case dbstruct.ProductIdH5ContactWechat:
contactProductId = dbstruct.ProductIdContactWechat contactProductId = dbstruct.ProductIdContactWechat
coinPrice = uVasInfo.GetH5WechatCoinPrice() coinPrice = uVasInfo.GetH5WechatCoinPrice()
req.Oid3 = dbstruct.ProductIdH5ContactWechat req.Oid3 = dbstruct.ProductIdH5ContactWechat
if coinPrice <= 0 {
err = errs.ErrVasInvalidCoinPrice
logger.Warn("invalid coin price, mid: %v, uid: %v, contactProductId: %v, coinPrice: %v", mid, uid, contactProductId, coinPrice)
return
}
case dbstruct.ProductIdSuperfanGiftContactWechat: case dbstruct.ProductIdSuperfanGiftContactWechat:
contactProductId = dbstruct.ProductIdContactWechat contactProductId = dbstruct.ProductIdContactWechat
coinPrice = 0 coinPrice = 0
@ -622,11 +632,6 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
err = errs.ErrVasInvalidContactProduct err = errs.ErrVasInvalidContactProduct
return return
} }
if contactProductId != dbstruct.ProductIdSuperfanGiftContactWechat && coinPrice <= 0 {
err = errs.ErrVasInvalidCoinPrice
logger.Warn("invalid coin price, mid: %v, uid: %v, contactProductId: %v, coinPrice: %v", mid, uid, contactProductId, coinPrice)
return
}
// 开启事务 // 开启事务
tx, err := v.store.VasBegin(ctx) tx, err := v.store.VasBegin(ctx)