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

fix

This commit is contained in:
lwl0608 2024-10-11 00:37:00 +08:00
parent 0ca8714f12
commit 3d3513dcef
3 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1672,7 +1672,12 @@ func (v *Vas) PayCallback(ctx *gin.Context, p *vasproto.PayCallbackParamIn) erro
case dbstruct.ProductIdH5ZoneAdmission:
ch.SType = goproto.Int32(dbstruct.CHSTypeChargeZoneAdmission)
ch.Change = goproto.Int64(order.GetPayAmount())
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
ch.SType = goproto.Int32(dbstruct.CHSTypeChargeZoneSuperfanship)
ch.Change = goproto.Int64(order.GetPayAmount())
}
@ -1740,7 +1745,12 @@ func (v *Vas) PayCallback(ctx *gin.Context, p *vasproto.PayCallbackParamIn) erro
logger.Error("UnlockZoneAdmission fail, order: %v, err: %v", util.ToJson(order), err)
return err
}
case product.Id == dbstruct.ProductIdH5ZoneSuperfanship:
case product.Id == dbstruct.ProductIdH5ZoneSuperfanship,
product.Id == dbstruct.ProductIdH5ZoneSuperfanshipEternal,
product.Id == dbstruct.ProductIdH5ZoneSuperfanshipMonth,
product.Id == dbstruct.ProductIdH5ZoneSuperfanshipSeason,
product.Id == dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
product.Id == dbstruct.ProductIdH5ZoneSuperfanshipYear:
err = v.UnlockZoneSuperfanship(ctx, tx, order, dbstruct.ZoneUnlockTypePay)
if err != nil {
logger.Error("UnlockZoneSuperfanship fail, order: %v, err: %v", util.ToJson(order), err)

4
app/mix/service/logic/vas_zone.go
View File

@ -56,6 +56,10 @@ func (v *Vas) UpdateZoneVasInfo(ctx *gin.Context, req *vasproto.UpdateZoneVasReq
if req.AdmissionPrice <= 0 && req.IronfanshipPrice <= 0 && req.SuperfanshipPrice <= 0 {
return nil
}
if req.IsSuperfanshipEnabled == 1 && len(req.SuperfanPriceList) < 5 {
err1 := fmt.Errorf("SuperfanPriceList not fit length, req: %v", util.ToJson(req))
return err1
}
err := v.store.UpsertZoneVas(ctx, req.ZoneVas)
return err
}

43
app/mix/service/vasservice.go
View File

@ -365,7 +365,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "空间成员-代运营"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "空间动态-代运营"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "空间超粉-代运营"
case dbstruct.ProductIdContactWechat:
if chDB.GetCt() >= 1722497400 {
@ -384,7 +389,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "空间成员-合伙人"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "空间动态-合伙人"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "空间超粉-合伙人"
case dbstruct.ProductIdContactWechat:
if chDB.GetCt() >= 1722497400 {
@ -403,7 +413,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "空间成员"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "空间动态"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "空间超粉"
}
item.Change = changeMark + fmt.Sprintf("%d钻石", chDB.GetChange())
@ -423,7 +438,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "空间成员退款-代运营"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "空间动态退款-代运营"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "空间超粉退款-代运营"
}
item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
@ -437,7 +457,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "空间成员退款-合伙人"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "空间动态退款-合伙人"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "空间动态退款-合伙人"
}
item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
@ -451,7 +476,12 @@ func (s *Service) chListIncome(ctx *gin.Context, chList []*dbstruct.ConsumeHisto
item.Desc = "用户退款-空间成员"
case dbstruct.ProductIdH5ZoneMoment:
item.Desc = "用户退款-空间动态"
case dbstruct.ProductIdH5ZoneSuperfanship:
case dbstruct.ProductIdH5ZoneSuperfanship,
dbstruct.ProductIdH5ZoneSuperfanshipEternal,
dbstruct.ProductIdH5ZoneSuperfanshipMonth,
dbstruct.ProductIdH5ZoneSuperfanshipSeason,
dbstruct.ProductIdH5ZoneSuperfanshipHalfYear,
dbstruct.ProductIdH5ZoneSuperfanshipYear:
item.Desc = "用户退款-空间超粉"
}
item.Change = fmt.Sprintf("%d钻石", chDB.GetChange())
@ -947,6 +977,7 @@ func (s *Service) ZoneGetCashier(ctx *gin.Context, req *vasproto.ZoneGetCashierR
}
data.Price = zv.SuperfanshipPrice
data.Validity = zv.GetSuperfanshipDurationDesc()
data.SuperfanPriceList = zv.SuperfanPriceList
}
return
}