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

by Robin at 20241216

This commit is contained in:
Robin 2024-12-16 14:28:49 +08:00
parent 7ec5798e11
commit 7233ef223e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mix/controller/init.go
View File

@ -258,7 +258,7 @@ func Init(r *gin.Engine) {
apiZoneGroup.POST("member_list", middleware.JSONParamValidator(vasproto.GetZoneMemberListReq{}), middleware.JwtAuthenticator(), ZoneMemberList)
apiZoneGroup.POST("member_list_v2", middleware.JSONParamValidator(vasproto.GetZoneMemberListV2Req{}), middleware.JwtAuthenticator(), ZoneMemberListV2)
apiZoneGroup.POST("search_zone_member", middleware.JSONParamValidator(vasproto.SearchMemberReq{}), middleware.JwtAuthenticator(), SearchZoneMember)
apiZoneGroup.POST("free_join", middleware.JSONParamValidator(vasproto.ZoneFreeJoinReq{}), middleware.JwtAuthenticator(), ZoneFreeJoin)
apiZoneGroup.POST("free_join", middleware.JSONParamValidator(vasproto.ZoneFreeJoinReq{}), middleware.JwtAuthenticator(), ZoneFreeJoin, middleware.NotifSender())
apiZoneGroup.POST("exit", middleware.JSONParamValidator(vasproto.ZoneExitReq{}), middleware.JwtAuthenticator(), ZoneExit)
// 私密圈动态

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

@ -1109,6 +1109,14 @@ func (v *Vas) ZoneFreeJoin(ctx *gin.Context, mid, zid int64) error {
return err
}
// 发送通知
order := &dbstruct.Order{
Mid: goproto.Int64(mid),
Uid: goproto.Int64(zv.Mid),
}
acctMap, _ := v.account.GetAccountMapByMids(ctx, []int64{order.GetMid(), order.GetUid()})
v.notifBuilderHandler.Handle(ctx)(dbstruct.VasNotifTempKeyMap[dbstruct.ProductIdH5ZoneAdmission]...)(order, acctMap)
return nil
}

16
app/mix/service/notif_builder_handler.go
View File

@ -697,7 +697,7 @@ func (handler *NotifBuilderHandler) handleVasZoneAdmissionPurchased_Streamer() {
order := args[0].(*dbstruct.Order)
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneAdmissionPurchased_Streamer, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneAdmissionPurchased_Streamer, order.GetUid(), acct.GetName())
}
}
@ -730,7 +730,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_WxNotGift
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxNotGifted, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxNotGifted, order.GetUid(), acct.GetName())
}
}
@ -742,7 +742,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_WxPublic(
if zVas.IsSuperfanshipGiveWechat != 1 { // 赠送微信
return
}
uVas, _ := _DefaultVas.GetUserVasInfo(ctx, order.GetMid())
uVas, _ := _DefaultVas.GetUserVasInfo(ctx, order.GetUid())
if uVas.WechatLockType != dbstruct.UserVasLockTypeOpen { // 微信公开
return
}
@ -750,7 +750,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_WxPublic(
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxPublic, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxPublic, order.GetUid(), acct.GetName())
}
}
@ -762,7 +762,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_WxPrivate
if zVas.IsSuperfanshipGiveWechat != 1 { // 赠送微信
return
}
uVas, _ := _DefaultVas.GetUserVasInfo(ctx, order.GetMid())
uVas, _ := _DefaultVas.GetUserVasInfo(ctx, order.GetUid())
if uVas.WechatLockType != dbstruct.UserVasLockTypeLock { // 微信私密
return
}
@ -770,7 +770,7 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_WxPrivate
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxPrivate, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneSuperfanshipPurchased_WxPrivate, order.GetUid(), acct.GetName())
}
}
@ -788,7 +788,7 @@ func (handler *NotifBuilderHandler) handleVasZoneMomentPurchased_Streamer() {
order := args[0].(*dbstruct.Order)
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneMomentPurchased_Streamer, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneMomentPurchased_Streamer, order.GetUid(), acct.GetName())
}
}
@ -806,7 +806,7 @@ func (handler *NotifBuilderHandler) handleVasZoneIronfanshipUnlocked_Streamer()
order := args[0].(*dbstruct.Order)
acctMap := args[1].(map[int64]*dbstruct.Account)
acct := acctMap[order.GetMid()]
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneIronfanshipUnlocked_Streamer, order.GetMid(), acct.GetName())
DefaultService.utilWriteNotifInfo(ctx, consts.VasNotifTemp_ZoneIronfanshipUnlocked_Streamer, order.GetUid(), acct.GetName())
}
}