Merge branch 'feat-IRONFANS-70' into test
This commit is contained in:
commit
3b3d47eef6
|
@ -610,10 +610,20 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
|
|||
case dbstruct.ProductIdContactWechat:
|
||||
// 获取uid微信金币价格
|
||||
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:
|
||||
contactProductId = dbstruct.ProductIdContactWechat
|
||||
coinPrice = uVasInfo.GetH5WechatCoinPrice()
|
||||
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:
|
||||
contactProductId = dbstruct.ProductIdContactWechat
|
||||
coinPrice = 0
|
||||
|
@ -622,11 +632,6 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
|
|||
err = errs.ErrVasInvalidContactProduct
|
||||
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)
|
||||
|
|
Loading…
Reference in New Issue