Merge branch 'feat-IRONFANS-70' into test

This commit is contained in:
lwl0608 2024-04-23 17:02:08 +08:00
commit 89ad155d56
2 changed files with 2 additions and 2 deletions

View File

@ -622,7 +622,7 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
err = errs.ErrVasInvalidContactProduct
return
}
if coinPrice <= 0 {
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

View File

@ -1540,7 +1540,7 @@ func (s *Service) utilFillZonesWithApiVOInfo(ctx *gin.Context, list []*dbstruct.
// 填充访客身份
vo.VisitorRole = consts.Zone_Outsider
if zidZuMap[zid].IsUnlockAdmission() { // 访客已解锁空间是否有该zid
if zidZuMap[zid].IsUnlockAdmission() && tpZoneMap[zid] == nil && collabZoneMap[zid] == nil { // 访客已解锁空间是否有该zid
vo.VisitorRole = consts.Zone_Visitor
} else if zoneZidMap[zid] != nil { // 访客创建的空间是否有该zid
vo.VisitorRole = consts.Zone_Creater