Merge branch 'dev-lwl/rollback_zone_status' into test

This commit is contained in:
lwl0608 2024-07-19 17:46:37 +08:00
commit ab6422c107
2 changed files with 6 additions and 2 deletions

View File

@ -80,7 +80,7 @@ func OpRollbackZoneAdmissionExitStatus(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*zoneproto.OpRollbackZoneExitStatusParam)
ec, err := service.DefaultService.OpRollbackZoneAdmissionExitStatus(ctx, req)
if ec != errcode.ErrCodeVasSrvOk {
logger.Error("RefundOrder fail, req: %v, ec: %v", util.ToJson(req), ec)
logger.Error("OpRollbackZoneAdmissionExitStatus fail, req: %v, ec: %v", util.ToJson(req), ec)
if err != nil {
ReplyErrorMsg(ctx, err.Error())
return

View File

@ -1177,6 +1177,10 @@ func (s *Service) VasIncomePage(ctx *gin.Context, req *vasproto.IncomePageReq) (
}
func (s *Service) OpRollbackZoneAdmissionExitStatus(ctx *gin.Context, req *zoneproto.OpRollbackZoneExitStatusParam) (ec errcode.ErrCode, err error) {
defer func() {
ec, err = errs.DealVasErr(err)
}()
// 获取用户mid
userAcnt, _ := _DefaultAccount.OpListByUserId(ctx, &accountproto.OpListByUserIdReq{UserId: goproto.Int64(req.Userid)})
@ -1229,6 +1233,6 @@ func (s *Service) OpRollbackZoneAdmissionExitStatus(ctx *gin.Context, req *zonep
logger.Error("RollbackZoneAdmissionExitStatus fail, mid: %v, sMid: %v, zid: %v, zu: %v, err: %v", uMid, sMid, zid, util.ToJson(zu), err)
return
}
logger.Info("RollbackZoneAdmissionExitStatus success, uid: %v, suid: %v, mid: %v, sMid: %v, zid: %v", req.Userid, req.StreamerUserid, uMid, sMid, zid)
logger.Info("RollbackZoneAdmissionExitStatus success, uid: %v, suid: %v, mid: %v, sMid: %v, zu: %v", req.Userid, req.StreamerUserid, uMid, sMid, util.ToJson(zu))
return
}