From 81916b58bb01a89281fad69611f2c705e2724b32 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Tue, 12 Mar 2024 12:06:45 +0800 Subject: [PATCH 1/5] by Robin at 20240312; apply --- api/consts/option.go | 4 + api/consts/role.go | 4 + api/consts/status.go | 7 + api/errcode/errcode.go | 33 +++- .../proto/accountpunishment_op.go | 98 ++++++++++ .../proto/accountpunishment_vo_op.go | 11 ++ .../proto/not_null_def_op.go | 20 ++ app/mix/controller/accountpunishment_op.go | 95 ++++++++++ app/mix/controller/init.go | 16 ++ app/mix/controller/moment_api.go | 7 +- app/mix/dao/mongo.go | 119 ++++++++++++ app/mix/dao/mongo_idseq.go | 27 +++ app/mix/service/apiservice.go | 11 +- .../service/apiservice_business_validation.go | 6 +- app/mix/service/business_validator/auth.go | 83 +++++++++ app/mix/service/logic/accountpunishment.go | 103 +++++++++++ .../service/opservice_business_validation.go | 76 ++++++++ app/mix/service/service.go | 171 ++++++++++++++++++ codecreate/codecreate.go | 8 +- codecreate/consts/consts.go | 2 +- codecreate/resource/EntityDefine.xlsx | Bin 43796 -> 45070 bytes codecreate/template/mongo.txt | 17 -- dbstruct/accountpunishment.go | 25 +++ dbstruct/idSeq.go | 4 + etc/mix/mix-test.yaml | 2 +- 25 files changed, 913 insertions(+), 36 deletions(-) create mode 100644 api/proto/accountpunishment/proto/accountpunishment_op.go create mode 100644 api/proto/accountpunishment/proto/accountpunishment_vo_op.go create mode 100644 api/proto/accountpunishment/proto/not_null_def_op.go create mode 100644 app/mix/controller/accountpunishment_op.go create mode 100644 app/mix/service/logic/accountpunishment.go create mode 100644 dbstruct/accountpunishment.go diff --git a/api/consts/option.go b/api/consts/option.go index 106c1f3e..ba31b497 100644 --- a/api/consts/option.go +++ b/api/consts/option.go @@ -9,3 +9,7 @@ const ( TextAuditTaskUpdate_Pass = 0 TextAuditTaskUpdate_Rollback = 1 ) + +const ( + AccountPunishment_BlockFromCreatingMoment = 0 // 禁止发贴 +) diff --git a/api/consts/role.go b/api/consts/role.go index 6786a55f..dbe17db3 100644 --- a/api/consts/role.go +++ b/api/consts/role.go @@ -13,3 +13,7 @@ const ( Supportor = 2 //运营 Streamer = 3 //主播 ) + +var AccountPunishmentRoleMap = map[int64][]int64{ + AccountPunishment_BlockFromCreatingMoment: {Streamer}, +} diff --git a/api/consts/status.go b/api/consts/status.go index 2fb13e0e..7e73c599 100644 --- a/api/consts/status.go +++ b/api/consts/status.go @@ -117,3 +117,10 @@ const ( TextAuditIsAligned_No = 0 //否 TextAuditIsAligned_Yes = 1 //是 ) + +// 账号处罚状态 +const ( + AccountPunishment_Punishing = 0 //处罚中 + AccountPunishment_Finished = 1 //正常结束 + AccountPunishment_Interrupted = 2 //提前中止 +) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 9bf99398..428a6908 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -63,8 +63,9 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeVasAlipayUniTransferFail: "支付宝提现失败", ErrCodeVasOverTodayWithdrawCnt: "今日提现次数到达上限", - ErrCodeMomentSrvFail: "动态服务错误", - ErrCodeMomentNotExist: "动态不存在", + ErrCodeMomentSrvFail: "动态服务错误", + ErrCodeMomentNotExist: "动态不存在", + ErrCodMomentBlockedFromCreatingMoment: "该用户的动态创建功能已被封禁至%v", ErrCodeFootPrintSrvFail: "足迹服务错误", ErrCodeFootPrintNotExist: "足迹不存在", @@ -150,6 +151,13 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeMomentAuditTaskSrvFail: "动态审核任务表服务错误", ErrCodeMomentAuditTaskNotExist: "动态审核任务表不存在", + + ErrCodeAccountPunishmentSrvFail: "账号处罚服务错误", + ErrCodeAccountPunishmentNotExist: "账号处罚不存在", + ErrCodeAccountPunishmentDuplicateKey: "该账号已有该类型处罚，若要更改处罚时长，请先中止当前处罚！", + ErrCodeAccountPunishmentHasFinished: "账号处罚已正常结束，无法执行该操作！", + ErrCodeAccountPunishmentHasBeenInterrupted: "账号处罚已提前中止，无法执行该操作！", + ErrCodeAccountPunishmentStreamerOnly: "该账号处罚行为仅能对主播进行！", } const ( @@ -204,8 +212,8 @@ const ( ErrCodeAccountSrvOk ErrCode = ErrCodeOk ErrCodeAccountSrvFail ErrCode = -6001 //账户服务错误 ErrCodeAccountNotExist ErrCode = -6002 //账户信息不存在 - ErrCodeAccountInviterNotExist ErrCode = -6003 //邀请人不存在, - ErrCodeAccountInviterIsNotAStreamer ErrCode = -6004 //邀请人非主播, + ErrCodeAccountInviterNotExist ErrCode = -6003 //邀请人不存在 + ErrCodeAccountInviterIsNotAStreamer ErrCode = -6004 //邀请人非主播 // Vas: 7xxx ErrCodeVasSrvOk ErrCode = ErrCodeOk @@ -233,9 +241,10 @@ const ( ErrCodeVasOverTodayWithdrawCnt ErrCode = -7022 // 今天提现次数到达上限 // Moment: 8xxx - ErrCodeMomentSrvOk ErrCode = ErrCodeOk - ErrCodeMomentSrvFail ErrCode = -8001 // 动态服务错误 - ErrCodeMomentNotExist ErrCode = -8002 // 动态不存在 + ErrCodeMomentSrvOk ErrCode = ErrCodeOk + ErrCodeMomentSrvFail ErrCode = -8001 // 动态服务错误 + ErrCodeMomentNotExist ErrCode = -8002 // 动态不存在 + ErrCodMomentBlockedFromCreatingMoment ErrCode = -8003 // 动态创建已被封禁 // FootPrint: 9xxx ErrCodeFootPrintSrvOk ErrCode = ErrCodeOk @@ -358,6 +367,16 @@ const ( ErrCodeMomentAuditTaskSrvFail ErrCode = -29001 // 动态审核任务表服务错误 ErrCodeMomentAuditTaskNotExist ErrCode = -29002 // 动态审核任务表不存在 + // AccountPunishment: 32xxx + ErrCodeAccountPunishmentSrvOk ErrCode = ErrCodeOk + ErrCodeAccountPunishmentSrvFail ErrCode = -32001 // 账号处罚服务错误 + ErrCodeAccountPunishmentNotExist ErrCode = -32002 // 账号处罚不存在 + ErrCodeAccountPunishmentExist ErrCode = -32003 // 账号处罚存在 + ErrCodeAccountPunishmentDuplicateKey ErrCode = -32004 // 账号处罚重复创建 + ErrCodeAccountPunishmentHasFinished ErrCode = -32005 // 账号处罚已正常结束 + ErrCodeAccountPunishmentHasBeenInterrupted ErrCode = -32006 // 账号处罚已提前中止 + ErrCodeAccountPunishmentStreamerOnly ErrCode = -32007 // 该账号处罚仅能对主播进行 + // Media: 60xxx ErrCodeMediaSrvOk ErrCode = ErrCodeOk ErrCodeMediaSrvFail ErrCode = -60001 // 媒体服务错误 diff --git a/api/proto/accountpunishment/proto/accountpunishment_op.go b/api/proto/accountpunishment/proto/accountpunishment_op.go new file mode 100644 index 00000000..2fd83a0c --- /dev/null +++ b/api/proto/accountpunishment/proto/accountpunishment_op.go @@ -0,0 +1,98 @@ +package proto + +import ( + "service/api/base" + "service/dbstruct" +) + +// op 创建 +type OpCreateReq struct { + base.BaseRequest + *dbstruct.AccountPunishment +} + +type OpCreateData struct { +} + +type OpCreateResp struct { + base.BaseResponse + Data *OpCreateData `json:"data"` +} + +// op 删除 +type OpDeleteReq struct { + base.BaseRequest + Id int64 `json:"id"` +} + +type OpDeleteData struct { +} + +type OpDeleteResp struct { + base.BaseResponse + Data *OpDeleteData `json:"data"` +} + +// op 更新 +type OpUpdateReq struct { + base.BaseRequest + *dbstruct.AccountPunishment +} + +type OpUpdateData struct { +} + +type OpUpdateResp struct { + base.BaseResponse + Data *OpUpdateData `json:"data"` +} + +// op 列表 +type OpListReq struct { + base.BaseRequest + Offset int `json:"offset"` + Limit int `json:"limit"` +} + +type OpListData struct { + List []*OpAccountPunishmentVO `json:"list"` + Offset int `json:"offset"` + More int `json:"more"` +} + +type OpListResp struct { + base.BaseResponse + Data *OpListData `json:"data"` +} + +// op 解封 +type OpUnblockReq struct { + base.BaseRequest + Id *int64 `json:"id"` +} + +type OpUnblockData struct { +} + +type OpUnblockResp struct { + base.BaseResponse + Data *OpUnblockData `json:"data"` +} + +// op 查询已结束的封禁 +type OpListTerminatedReq struct { + base.BaseRequest + Offset int `json:"offset"` + Limit int `json:"limit"` +} + +type OpListTerminatedData struct { + List []*OpAccountPunishmentVO `json:"list"` + Offset int `json:"offset"` + More int `json:"more"` +} + +type OpListTerminatedResp struct { + base.BaseResponse + Data *OpListTerminatedData `json:"data"` +} diff --git a/api/proto/accountpunishment/proto/accountpunishment_vo_op.go b/api/proto/accountpunishment/proto/accountpunishment_vo_op.go new file mode 100644 index 00000000..8f3980a1 --- /dev/null +++ b/api/proto/accountpunishment/proto/accountpunishment_vo_op.go @@ -0,0 +1,11 @@ +package proto + +import ( + accountproto "service/api/proto/account/proto" + "service/dbstruct" +) + +type OpAccountPunishmentVO struct { + Account *accountproto.OpListVO `json:"account"` + List []*dbstruct.AccountPunishment `json:"account_punishments"` +} diff --git a/api/proto/accountpunishment/proto/not_null_def_op.go b/api/proto/accountpunishment/proto/not_null_def_op.go new file mode 100644 index 00000000..e7cbdda0 --- /dev/null +++ b/api/proto/accountpunishment/proto/not_null_def_op.go @@ -0,0 +1,20 @@ +package proto + +import ( + "service/library/validator" +) + +// op 创建 +func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) { + params = make([]*validator.JsonParam, 0) + params = append(params, validator.NewInt64PtrParam("请填写欲进行处罚的账号mid", p.AccountPunishment.Mid)) + params = append(params, validator.NewInt64PtrParam("请填写欲进行的处罚类型", p.AccountPunishment.Type)) + params = append(params, validator.NewInt64PtrParam("请填写处罚时长", p.AccountPunishment.Duration)) + return params +} + +func (p *OpUnblockReq) ProvideNotNullValue() (params []*validator.JsonParam) { + params = make([]*validator.JsonParam, 0) + params = append(params, validator.NewInt64PtrParam("请填写欲进行解封的账号处罚表id", p.Id)) + return params +} diff --git a/app/mix/controller/accountpunishment_op.go b/app/mix/controller/accountpunishment_op.go new file mode 100644 index 00000000..b8ceccb1 --- /dev/null +++ b/app/mix/controller/accountpunishment_op.go @@ -0,0 +1,95 @@ +package controller + +import ( + "service/api/consts" + "service/api/errcode" + accountpunishmentproto "service/api/proto/accountpunishment/proto" + "service/app/mix/service" + "service/bizcommon/util" + "service/library/logger" + "service/library/mediafiller" + + "github.com/gin-gonic/gin" +) + +func OpCreateAccountPunishment(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*accountpunishmentproto.OpCreateReq) + ec := service.DefaultService.OpCreateAccountPunishment(ctx, req) + if ec != errcode.ErrCodeAccountPunishmentSrvOk { + logger.Error("OpCreateAccountPunishment fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + ReplyOk(ctx, nil) +} + +func OpGetAccountPunishmentList(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*accountpunishmentproto.OpListReq) + + //设置默认页长 + if req.Limit == 0 { + req.Limit = consts.DefaultPageSize + } + + list, ec := service.DefaultService.OpGetAccountPunishmentList(ctx, req) + if ec != errcode.ErrCodeAccountPunishmentSrvOk { + logger.Error("OpGetAccountPunishmentList fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + //填充媒体切片 + objectMediaNum := 1 // 单个账号封禁服务总共1个媒体类 + mediafillables := make([]mediafiller.MediaFillable, len(list)*objectMediaNum) + for i, vo := range list { + mediafillables[objectMediaNum*i+0] = vo.Account.Avatar + } + mediafiller.FillList(ctx, mediafillables) + + data := &accountpunishmentproto.OpListData{ + List: list, + } + ReplyOk(ctx, data) +} + +func OpUnblockAccountPunishment(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*accountpunishmentproto.OpUnblockReq) + ec := service.DefaultService.OpUnblockAccountPunishment(ctx, req) + if ec != errcode.ErrCodeAccountPunishmentSrvOk { + logger.Error("OpUnblockAccountPunishment fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + ReplyOk(ctx, nil) +} + +func OpGetTerminatedAccountPunishmentList(ctx *gin.Context) { + req := ctx.MustGet("client_req").(*accountpunishmentproto.OpListTerminatedReq) + + //设置默认页长 + if req.Limit == 0 { + req.Limit = consts.DefaultPageSize + } + + list, ec := service.DefaultService.OpGetTerminatedAccountPunishmentList(ctx, req) + if ec != errcode.ErrCodeAccountPunishmentSrvOk { + logger.Error("OpGetTerminatedAccountPunishmentList fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsg(ctx, ec) + return + } + + //填充媒体切片 + objectMediaNum := 1 // 单个账号封禁服务总共1个媒体类 + mediafillables := make([]mediafiller.MediaFillable, len(list)*objectMediaNum) + for i, vo := range list { + mediafillables[objectMediaNum*i+0] = vo.Account.Avatar + } + mediafiller.FillList(ctx, mediafillables) + + data := &accountpunishmentproto.OpListData{ + List: list, + } + ReplyOk(ctx, data) +} diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index d6633c5d..015d6a13 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -19,6 +19,7 @@ import ( "service/api/consts" "service/api/errcode" accountproto "service/api/proto/account/proto" + accountpunishmentproto "service/api/proto/accountpunishment/proto" accountrelationproto "service/api/proto/accountrelation/proto" appconfigproto "service/api/proto/app_config/proto" callhistoryproto "service/api/proto/callhistory/proto" @@ -408,6 +409,13 @@ func Init(r *gin.Engine) { opAppConfigGroup.POST("update", middleware.JSONParamValidator(appconfigproto.OpUpdateReq{}), middleware.JwtAuthenticator(), OpUpdateAppConfig) opAppConfigGroup.POST("list_by_key", middleware.JSONParamValidator(appconfigproto.OpListByKeyReq{}), middleware.JwtAuthenticator(), OpGetAppConfigListByKey) + // 账号处罚 + opAccountPunishmentGroup := r.Group("/op/account_punishment", PrepareOp()) + opAccountPunishmentGroup.POST("create", middleware.JSONParamValidator(accountpunishmentproto.OpCreateReq{}), middleware.JwtAuthenticator(), OpCreateAccountPunishment) + opAccountPunishmentGroup.POST("list", middleware.JSONParamValidator(accountpunishmentproto.OpListReq{}), middleware.JwtAuthenticator(), OpGetAccountPunishmentList) + opAccountPunishmentGroup.POST("unblock", middleware.JSONParamValidator(accountpunishmentproto.OpUnblockReq{}), middleware.JwtAuthenticator(), OpUnblockAccountPunishment) + opAccountPunishmentGroup.POST("list_terminated", middleware.JSONParamValidator(accountpunishmentproto.OpListTerminatedReq{}), middleware.JwtAuthenticator(), OpGetTerminatedAccountPunishmentList) + // 账号相关 //accountGroup := r.Group("/account") @@ -443,6 +451,14 @@ func ReplyErrCodeMsg(ctx *gin.Context, ec errcode.ErrCode) { }) } +func ReplyErrCodeMsgAndDetail(ctx *gin.Context, ec errcode.ErrCode, params ...any) { + ctx.AbortWithStatusJSON(http.StatusOK, base.BaseResponse{ + Ret: consts.RetCodeFail, + ErrCode: ec, + Msg: fmt.Sprintf(errcode.ErrCodeMsgMap[ec], params), + }) +} + func ReplyJsonError(ctx *gin.Context, code int, msg string) { ctx.AbortWithStatusJSON(code, base.BaseResponse{ Ret: consts.RetCodeFail, diff --git a/app/mix/controller/moment_api.go b/app/mix/controller/moment_api.go index 00314360..fca17ce3 100644 --- a/app/mix/controller/moment_api.go +++ b/app/mix/controller/moment_api.go @@ -14,7 +14,12 @@ import ( func ApiCreateMoment(ctx *gin.Context) { req := ctx.MustGet("client_req").(*momentproto.ApiCreateReq) - ec := service.DefaultService.ApiCreateMoment(ctx, req) + ec, acctPunEndTime := service.DefaultService.ApiCreateMoment(ctx, req) + if ec == errcode.ErrCodMomentBlockedFromCreatingMoment { + logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec) + ReplyErrCodeMsgAndDetail(ctx, ec, acctPunEndTime) + return + } if ec != errcode.ErrCodeMomentSrvOk { logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec) ReplyErrCodeMsg(ctx, ec) diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go index 7ff1516f..346a42fc 100644 --- a/app/mix/dao/mongo.go +++ b/app/mix/dao/mongo.go @@ -15,6 +15,7 @@ import ( "go.mongodb.org/mongo-driver/bson" accountproto "service/api/proto/account/proto" + accountpunishmentproto "service/api/proto/accountpunishment/proto" accountrelationproto "service/api/proto/accountrelation/proto" appconfigproto "service/api/proto/app_config/proto" callhistoryproto "service/api/proto/callhistory/proto" @@ -154,6 +155,9 @@ const ( DBMomentAuditTask = "moment_audit_task" COLMomentAuditTask = "moment_audit_task" + + DBAccountPunishment = "account_punishment" + COLAccountPunishment = "account_punishment" ) // 商品表 @@ -360,6 +364,11 @@ func (m *Mongo) getColMomentAuditTask() *qmgo.Collection { return m.clientMix.Database(DBMomentAuditTask).Collection(COLMomentAuditTask) } +// 账号处罚表 +func (m *Mongo) getColAccountPunishment() *qmgo.Collection { + return m.clientMix.Database(DBAccountPunishment).Collection(COLAccountPunishment) +} + // 商品相关 func (m *Mongo) CreateProduct(ctx *gin.Context, product *dbstruct.Product) error { col := m.getColProduct() @@ -3297,3 +3306,113 @@ func (m *Mongo) GetAppConfigListByKey(ctx *gin.Context, req *appconfigproto.OpLi } return appconfig, err } + +// 账号处罚相关 +func (m *Mongo) CreateAccountPunishment(ctx *gin.Context, accountpunishment *dbstruct.AccountPunishment) error { + col := m.getColAccountPunishment() + _, err := col.InsertOne(ctx, accountpunishment) + return err +} + +func (m *Mongo) UpdateAccountPunishment(ctx *gin.Context, accountpunishment *dbstruct.AccountPunishment) error { + col := m.getColAccountPunishment() + set := util.EntityToM(accountpunishment) + set["ut"] = time.Now().Unix() + up := qmgo.M{ + "$set": set, + } + err := col.UpdateId(ctx, accountpunishment.Id, up) + return err +} + +func (m *Mongo) DeleteAccountPunishment(ctx *gin.Context, id int64) error { + col := m.getColAccountPunishment() + update := qmgo.M{ + "$set": qmgo.M{ + "del_flag": 1, + }, + } + err := col.UpdateId(ctx, id, update) + return err +} + +func (m *Mongo) GetAccountPunishmentList(ctx *gin.Context, req *accountpunishmentproto.OpListReq) ([]*dbstruct.AccountPunishment, error) { + list := make([]*dbstruct.AccountPunishment, 0) + col := m.getColAccountPunishment() + query := qmgo.M{ + "status": qmgo.M{ + "$ne": consts.AccountPunishment_Interrupted, + }, + "end_time": qmgo.M{ + "$gt": time.Now().Unix(), + }, + "del_flag": 0, + } + err := col.Find(ctx, query).Sort("-ct").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list) + if err == qmgo.ErrNoSuchDocuments { + err = nil + return list, err + } + return list, err +} + +func (m *Mongo) GetAccountPunishmentListById(ctx *gin.Context, id int64) (*dbstruct.AccountPunishment, error) { + accountpunishment := &dbstruct.AccountPunishment{} + col := m.getColAccountPunishment() + query := qmgo.M{ + "_id": id, + "del_flag": 0, + } + err := col.Find(ctx, query).One(&accountpunishment) + if err == qmgo.ErrNoSuchDocuments { + err = nil + return nil, err + } + return accountpunishment, err +} + +func (m *Mongo) GetAccountPunishmentListByMidAndType(ctx *gin.Context, mid int64, typ int64) (*dbstruct.AccountPunishment, error) { + accountpunishment := &dbstruct.AccountPunishment{} + col := m.getColAccountPunishment() + query := qmgo.M{ + "mid": mid, + "type": typ, + "status": qmgo.M{ + "$ne": consts.AccountPunishment_Interrupted, + }, + "end_time": qmgo.M{ + "$gt": time.Now().Unix(), + }, + "del_flag": 0, + } + err := col.Find(ctx, query).One(&accountpunishment) + if err == qmgo.ErrNoSuchDocuments { + err = nil + return nil, err + } + return accountpunishment, err +} + +func (m *Mongo) GetTerminatedAccountPunishmentList(ctx *gin.Context, req *accountpunishmentproto.OpListTerminatedReq) ([]*dbstruct.AccountPunishment, error) { + list := make([]*dbstruct.AccountPunishment, 0) + col := m.getColAccountPunishment() + query := qmgo.M{ + "$or": []qmgo.M{ + { + "status": consts.AccountPunishment_Interrupted, + }, + { + "end_time": qmgo.M{ + "$lte": time.Now().Unix(), + }, + }, + }, + "del_flag": 0, + } + err := col.Find(ctx, query).Sort("-ct").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list) + if err == qmgo.ErrNoSuchDocuments { + err = nil + return list, err + } + return list, err +} diff --git a/app/mix/dao/mongo_idseq.go b/app/mix/dao/mongo_idseq.go index 372f962f..2919d232 100644 --- a/app/mix/dao/mongo_idseq.go +++ b/app/mix/dao/mongo_idseq.go @@ -45,6 +45,9 @@ const ( DBFeedbackIdSeq = "feedback_id_seq" COLFeedbackIdSeq = "feedback_id_seq" + + DBAccountPunishmentIdSeq = "account_punishment_id_seq" + COLAccountPunishmentIdSeq = "account_punishment_id_seq" ) // UserIdSeq序列表 @@ -107,6 +110,11 @@ func (m *Mongo) getColFeedbackIdSeq() *qmgo.Collection { return m.clientMix.Database(DBFeedbackIdSeq).Collection(COLFeedbackIdSeq) } +// AccountPunishmentIdSeq序列表 +func (m *Mongo) getColAccountPunishmentIdSeq() *qmgo.Collection { + return m.clientMix.Database(DBAccountPunishmentIdSeq).Collection(COLAccountPunishmentIdSeq) +} + // account_id发号器 func (m *Mongo) GetAndUpdateAccountIdSeq(ctx *gin.Context) (accountIdSeq *dbstruct.AccountIdSeq, err error) { col := m.getColAccountIdSeq() @@ -345,3 +353,22 @@ func (m *Mongo) GetAndUpdateMediaSeq(ctx *gin.Context) (mediaIdSeq *dbstruct.Med return &mediaIdSeqInstance, err } + +// accountpunishment_id发号器 +func (m *Mongo) GetAndUpdateAccountPunishmentIdSeq(ctx *gin.Context) (accountpunishmentIdSeq *dbstruct.AccountPunishmentIdSeq, err error) { + col := m.getColAccountPunishmentIdSeq() + + change := qmgo.Change{ + Update: qmgo.M{"$inc": qmgo.M{"seq": 1}}, + Upsert: true, + ReturnNew: false, + } + + accountpunishmentIdSeqInstance := dbstruct.AccountPunishmentIdSeq{} + if err = col.Find(ctx, qmgo.M{"_id": "account_punishment_id_seq_id"}).Apply(change, &accountpunishmentIdSeqInstance); err != nil { + logger.Error("change error : %v", err) + return + } + + return &accountpunishmentIdSeqInstance, err +} diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index cfafedb5..b9f66af3 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -1574,12 +1574,17 @@ func (s *Service) ApiGetContactCustomerServiceSessionListByMid(ctx *gin.Context, } // Moment -func (s *Service) ApiCreateMoment(ctx *gin.Context, req *momentproto.ApiCreateReq) (ec errcode.ErrCode) { +func (s *Service) ApiCreateMoment(ctx *gin.Context, req *momentproto.ApiCreateReq) (ec errcode.ErrCode, acctPunEndTime string) { ec = errcode.ErrCodeMomentSrvOk req.Moment.Mid = goproto.Int64(req.BaseRequest.Mid) - - if ec = s.ApiCreateMomentBusinessValidate(ctx, req); ec != errcode.ErrCodeMomentSrvOk { + var accountpunishment *dbstruct.AccountPunishment + if ec, accountpunishment = s.ApiCreateMomentBusinessValidate(ctx, req); ec != errcode.ErrCodeMomentSrvOk { + if ec == errcode.ErrCodeAccountPunishmentExist { + ec = errcode.ErrCodMomentBlockedFromCreatingMoment + acctPunEndTime = accountpunishment.GetEndTimeFormatString() + return + } return } diff --git a/app/mix/service/apiservice_business_validation.go b/app/mix/service/apiservice_business_validation.go index a4a698a0..c7419c52 100644 --- a/app/mix/service/apiservice_business_validation.go +++ b/app/mix/service/apiservice_business_validation.go @@ -524,16 +524,18 @@ func (s *Service) ApiGetStreamerWxIdBusinessValidate(ctx *gin.Context, req *stre return } -func (s *Service) ApiCreateMomentBusinessValidate(ctx *gin.Context, req *momentproto.ApiCreateReq) (ec errcode.ErrCode) { +func (s *Service) ApiCreateMomentBusinessValidate(ctx *gin.Context, req *momentproto.ApiCreateReq) (ec errcode.ErrCode, accountpunishment *dbstruct.AccountPunishment) { ec = errcode.ErrCodeMomentSrvOk resultList := businessvalidator.NewAuthBusinessValidator(ctx, req). + EnsureSuchAccountPunishmentNotExist(req.GetBaseRequest().Mid, consts.AccountPunishment_BlockFromCreatingMoment, _DefaultAccountPunishment.OpListByMidAndType). QueryMomentCreateTimes(_DefaultMomentCreateTimes.OpGetAndUpdate, req.GetBaseRequest().Mid). EnsureMomentCreateTimesNotReachedDailyUpperbound(). Validate(). Collect() ec, _ = resultList[0].(errcode.ErrCode) - if ec != errcode.ErrCodeLoginSrvOk { + accountpunishment, _ = resultList[3].(*dbstruct.AccountPunishment) + if ec != errcode.ErrCodeOk { logger.Error("ApiCreateMomentBusinessValidate business validation failed!") return } diff --git a/app/mix/service/business_validator/auth.go b/app/mix/service/business_validator/auth.go index 194d5364..ad49d5a5 100644 --- a/app/mix/service/business_validator/auth.go +++ b/app/mix/service/business_validator/auth.go @@ -10,6 +10,7 @@ import ( "service/dbstruct" "service/library/apollo" "service/library/logger" + "time" "github.com/gin-gonic/gin" goproto "google.golang.org/protobuf/proto" @@ -25,6 +26,7 @@ type AuthBusinessValidator struct { account *dbstruct.Account accountrelation *dbstruct.AccountRelation momentCreateTimes *dbstruct.MomentCreateTimes + accountpunishment *dbstruct.AccountPunishment } func NewAuthBusinessValidator(ctx *gin.Context, req any) *AuthBusinessValidator { @@ -297,6 +299,86 @@ func (l *AuthBusinessValidator) EnsureMomentCreateTimesNotReachedDailyUpperbound return l } +func (l *AuthBusinessValidator) EnsureAccountPunishmentHasNotTerminated(id int64, QueryFunc func(ctx *gin.Context, id int64) (*dbstruct.AccountPunishment, error)) *AuthBusinessValidator { + l.oplist = append(l.oplist, func() { + accountpunishment, err := QueryFunc(l.ctx, id) + if err != nil { + logger.Error("Query account punishment failed, err: %v", err) + l.ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + if accountpunishment == nil { + logger.Error("No account punishment was found") + l.ec = errcode.ErrCodeAccountPunishmentNotExist + return + } + if util.DerefInt64(accountpunishment.Status) == consts.AccountPunishment_Interrupted { + l.ec = errcode.ErrCodeAccountPunishmentHasBeenInterrupted + return + } + if util.DerefInt64(accountpunishment.EndTime) <= time.Now().Unix() { + l.ec = errcode.ErrCodeAccountPunishmentHasFinished + return + } + }) + return l +} + +func (l *AuthBusinessValidator) EnsureAccountPunishmentMatchesRoleOfTarget(uid int64, typ int64, QueryFunc func(ctx *gin.Context, req *accountproto.OpListByMidReq) (*dbstruct.Account, error)) *AuthBusinessValidator { + l.oplist = append(l.oplist, func() { + acct, err := QueryFunc(l.ctx, &accountproto.OpListByMidReq{ + Mid: goproto.Int64(uid), + }) + if err != nil { + logger.Error("Query account failed, err: %v", err) + l.ec = errcode.ErrCodeAccountSrvFail + return + } + if acct == nil { + logger.Error("No account entity was found") + l.ec = errcode.ErrCodeAccountNotExist + return + } + acctRole := util.DerefInt64(acct.Role) + pass := false + for _, role := range consts.AccountPunishmentRoleMap[typ] { + if acctRole == role { + pass = true + break + } + } + if !pass { + switch typ { + case consts.AccountPunishment_BlockFromCreatingMoment: + l.ec = errcode.ErrCodeAccountPunishmentStreamerOnly + default: + l.ec = errcode.ErrCodeAccountPunishmentSrvFail + } + } + + }) + return l +} + +func (l *AuthBusinessValidator) EnsureSuchAccountPunishmentNotExist(uid int64, typ int64, QueryFunc func(ctx *gin.Context, mid int64, typ int64) (*dbstruct.AccountPunishment, error)) *AuthBusinessValidator { + l.oplist = append(l.oplist, func() { + accountpunishment, err := QueryFunc(l.ctx, uid, typ) + if err != nil { + logger.Error("Query account punishment failed, err: %v", err) + l.ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + + if accountpunishment != nil { + l.ec = errcode.ErrCodeAccountPunishmentExist + l.accountpunishment = accountpunishment + return + } + + }) + return l +} + // 执行校验 func (a *AuthBusinessValidator) Validate() *AuthBusinessValidator { a.BusinessValidateStream.Validate() @@ -308,5 +390,6 @@ func (a *AuthBusinessValidator) Collect() []any { resultList[0] = a.ec resultList[1] = a.account resultList[2] = a.accountrelation + resultList[3] = a.accountpunishment return resultList } diff --git a/app/mix/service/logic/accountpunishment.go b/app/mix/service/logic/accountpunishment.go new file mode 100644 index 00000000..45403e9f --- /dev/null +++ b/app/mix/service/logic/accountpunishment.go @@ -0,0 +1,103 @@ +package logic + +import ( + "service/api/consts" + accountpunishmentproto "service/api/proto/accountpunishment/proto" + "service/app/mix/dao" + "service/bizcommon/util" + "service/dbstruct" + "service/library/logger" + "time" + + "github.com/gin-gonic/gin" + goproto "google.golang.org/protobuf/proto" +) + +type AccountPunishment struct { + store *dao.Store +} + +func NewAccountPunishment(store *dao.Store) (a *AccountPunishment) { + a = &AccountPunishment{ + store: store, + } + return +} + +func (p *AccountPunishment) OpCreate(ctx *gin.Context, req *accountpunishmentproto.OpCreateReq) error { + + //产生id + accountpunishmentIdSeq, err := p.store.GetAndUpdateAccountPunishmentIdSeq(ctx) + if err != nil { + logger.Error("GetAndUpdateAccountPunishmentIdSeq failed : %v", err) + return err + } + + nowTime := time.Now().Unix() + req.AccountPunishment.Id = goproto.Int64(accountpunishmentIdSeq.Seq) + req.AccountPunishment.Status = goproto.Int64(consts.AccountPunishment_Punishing) + req.AccountPunishment.EndTime = goproto.Int64(nowTime + util.DerefInt64(req.Duration)) + req.AccountPunishment.Ct = goproto.Int64(nowTime) + req.AccountPunishment.Ut = goproto.Int64(nowTime) + req.AccountPunishment.DelFlag = goproto.Int64(consts.Exist) + err = p.store.CreateAccountPunishment(ctx, req.AccountPunishment) + if err != nil { + logger.Error("CreateAccountPunishment fail, err: %v", err) + return err + } + return nil +} + +func (p *AccountPunishment) OpUpdate(ctx *gin.Context, req *accountpunishmentproto.OpUpdateReq) error { + err := p.store.UpdateAccountPunishment(ctx, req.AccountPunishment) + if err != nil { + logger.Error("UpdateAccountPunishment fail, err: %v", err) + return err + } + return nil +} + +func (p *AccountPunishment) OpDelete(ctx *gin.Context, id int64) error { + err := p.store.DeleteAccountPunishment(ctx, id) + if err != nil { + logger.Error("DeleteAccountPunishment fail, err: %v", err) + return err + } + return nil +} + +func (p *AccountPunishment) OpList(ctx *gin.Context, req *accountpunishmentproto.OpListReq) ([]*dbstruct.AccountPunishment, error) { + list, err := p.store.GetAccountPunishmentList(ctx, req) + if err != nil { + logger.Error("GetAccountPunishmentList fail, err: %v", err) + return make([]*dbstruct.AccountPunishment, 0), err + } + return list, nil +} + +func (p *AccountPunishment) OpListTerminated(ctx *gin.Context, req *accountpunishmentproto.OpListTerminatedReq) ([]*dbstruct.AccountPunishment, error) { + list, err := p.store.GetTerminatedAccountPunishmentList(ctx, req) + if err != nil { + logger.Error("GetTerminatedAccountPunishmentList fail, err: %v", err) + return make([]*dbstruct.AccountPunishment, 0), err + } + return list, nil +} + +func (p *AccountPunishment) OpListById(ctx *gin.Context, id int64) (*dbstruct.AccountPunishment, error) { + accountpunishment, err := p.store.GetAccountPunishmentListById(ctx, id) + if err != nil { + logger.Error("GetAccountPunishmentListById fail, err: %v", err) + return nil, err + } + return accountpunishment, nil +} + +func (p *AccountPunishment) OpListByMidAndType(ctx *gin.Context, mid int64, typ int64) (*dbstruct.AccountPunishment, error) { + accountpunishment, err := p.store.GetAccountPunishmentListByMidAndType(ctx, mid, typ) + if err != nil { + logger.Error("GetAccountPunishmentListByMid fail, err: %v", err) + return nil, err + } + return accountpunishment, nil +} diff --git a/app/mix/service/opservice_business_validation.go b/app/mix/service/opservice_business_validation.go index 2b15ca81..670abb84 100644 --- a/app/mix/service/opservice_business_validation.go +++ b/app/mix/service/opservice_business_validation.go @@ -3,6 +3,7 @@ package service import ( "service/api/errcode" accountproto "service/api/proto/account/proto" + accountpunishmentproto "service/api/proto/accountpunishment/proto" accountrelationproto "service/api/proto/accountrelation/proto" appconfigproto "service/api/proto/app_config/proto" callhistoryproto "service/api/proto/callhistory/proto" @@ -22,6 +23,7 @@ import ( userwxaddcheckproto "service/api/proto/userwxaddcheck/proto" vericodeproto "service/api/proto/vericode/proto" businessvalidator "service/app/mix/service/business_validator" + "service/bizcommon/util" "service/dbstruct" "service/library/logger" "service/library/mycrypto" @@ -1334,3 +1336,77 @@ func (s *Service) OpGetAppConfigListByKeyBusinessValidate(ctx *gin.Context, req } return } + +func (s *Service) OpCreateAccountPunishmentBusinessValidate(ctx *gin.Context, req *accountpunishmentproto.OpCreateReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + uid := util.DerefInt64(req.AccountPunishment.Mid) + typ := util.DerefInt64(req.AccountPunishment.Type) + + // 1.业务校验 + result := businessvalidator.NewAuthBusinessValidator(ctx, req). + QueryAccount(_DefaultAccount.OpListByMid). + EnsureAccountExist(). + EnsureIsOpRole(). + EnsureAccountPunishmentMatchesRoleOfTarget(uid, typ, _DefaultAccount.OpListByMid). + EnsureSuchAccountPunishmentNotExist(uid, typ, _DefaultAccountPunishment.OpListByMidAndType). + Validate(). + Collect() + if ec = result[0].(errcode.ErrCode); ec != errcode.ErrCodeOk { + logger.Error("OpCreateAccountPunishment business validation failed") + return + } + return +} + +func (s *Service) OpUnblockAccountPunishmentBusinessValidate(ctx *gin.Context, req *accountpunishmentproto.OpUnblockReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + // 1.业务校验 + result := businessvalidator.NewAuthBusinessValidator(ctx, req). + QueryAccount(_DefaultAccount.OpListByMid). + EnsureAccountExist(). + EnsureIsOpRole(). + EnsureAccountPunishmentHasNotTerminated(util.DerefInt64(req.Id), _DefaultAccountPunishment.OpListById). + Validate(). + Collect() + if ec = result[0].(errcode.ErrCode); ec != errcode.ErrCodeOk { + logger.Error("OpUnblockAccountPunishment business validation failed") + return + } + return +} + +func (s *Service) OpGetAccountPunishmentListBusinessValidate(ctx *gin.Context, req *accountpunishmentproto.OpListReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + // 1.业务校验 + result := businessvalidator.NewAuthBusinessValidator(ctx, req). + QueryAccount(_DefaultAccount.OpListByMid). + EnsureAccountExist(). + EnsureIsOpRole(). + Validate(). + Collect() + if ec = result[0].(errcode.ErrCode); ec != errcode.ErrCodeOk { + logger.Error("OpGetAccountPunishmentList business validation failed") + return + } + return +} + +func (s *Service) OpGetTerminatedAccountPunishmentListBusinessValidate(ctx *gin.Context, req *accountpunishmentproto.OpListTerminatedReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + // 1.业务校验 + result := businessvalidator.NewAuthBusinessValidator(ctx, req). + QueryAccount(_DefaultAccount.OpListByMid). + EnsureAccountExist(). + EnsureIsOpRole(). + Validate(). + Collect() + if ec = result[0].(errcode.ErrCode); ec != errcode.ErrCodeOk { + logger.Error("OpGetAccountPunishmentList business validation failed") + return + } + return +} diff --git a/app/mix/service/service.go b/app/mix/service/service.go index be24447f..96039331 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -52,6 +52,8 @@ import ( "service/library/payclients/wxpaycli" "service/library/redis" + accountpunishmentproto "service/api/proto/accountpunishment/proto" + "go.mongodb.org/mongo-driver/mongo" goproto "google.golang.org/protobuf/proto" @@ -100,6 +102,7 @@ var ( _DefaultXxlJob *logic.XxlJob _DefaultAppConfig *logic.AppConfig _DefaultMomentAuditTask *logic.MomentAuditTask + _DefaultAccountPunishment *logic.AccountPunishment ) type Service struct { @@ -176,6 +179,7 @@ func (s *Service) Init(c any) (err error) { _DefaultXxlJob = logic.NewXxlJob(store, cfg.XxlJob) _DefaultAppConfig = logic.NewAppConfig(store) _DefaultMomentAuditTask = logic.NewMomentAuditTask(store) + _DefaultAccountPunishment = logic.NewAccountPunishment(store) return } @@ -2883,3 +2887,170 @@ func (s *Service) OpGetAppConfigListByKey(ctx *gin.Context, req *appconfigproto. } return } + +// AccountPunishment +func (s *Service) OpCreateAccountPunishment(ctx *gin.Context, req *accountpunishmentproto.OpCreateReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + if ec = s.OpCreateAccountPunishmentBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountPunishmentSrvOk { + if ec == errcode.ErrCodeAccountPunishmentExist { + ec = errcode.ErrCodeAccountPunishmentDuplicateKey + return + } + return + } + + err := _DefaultAccountPunishment.OpCreate(ctx, req) + if err != nil { + logger.Error("OpCreate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + return +} + +func (s *Service) OpUnblockAccountPunishment(ctx *gin.Context, req *accountpunishmentproto.OpUnblockReq) (ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + if ec = s.OpUnblockAccountPunishmentBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountPunishmentSrvOk { + return + } + + err := _DefaultAccountPunishment.OpUpdate(ctx, &accountpunishmentproto.OpUpdateReq{ + AccountPunishment: &dbstruct.AccountPunishment{ + Id: req.Id, + Status: goproto.Int64(consts.AccountPunishment_Interrupted), + }, + }) + if err == qmgo.ErrNoSuchDocuments { + ec = errcode.ErrCodeAccountPunishmentNotExist + err = nil + return + } + if err != nil { + logger.Error("OpUpdate fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + return +} + +func (s *Service) OpGetAccountPunishmentList(ctx *gin.Context, req *accountpunishmentproto.OpListReq) (volist []*accountpunishmentproto.OpAccountPunishmentVO, ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + if ec = s.OpGetAccountPunishmentListBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountPunishmentSrvOk { + return + } + + list, err := _DefaultAccountPunishment.OpList(ctx, req) + if err != nil { + logger.Error("OpGetAccountPunishmentList fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + + // 获取mid的set + midMap := make(map[int64]*dbstruct.Account) + midSet := make([]int64, 0) + for _, v := range list { + mid := util.DerefInt64(v.Mid) + if midMap[mid] != nil { + continue + } else { + midSet = append(midSet, mid) + midMap[mid] = &dbstruct.Account{} + } + } + + // 查询mid的map + acctMap, err := _DefaultAccount.GetAccountMapByMids(ctx, midSet) + if err != nil { + logger.Error("GetAccountMapByMids fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountSrvFail + return + } + + // 组装vo + volist = make([]*accountpunishmentproto.OpAccountPunishmentVO, 0) + voMap := make(map[int64]*accountpunishmentproto.OpAccountPunishmentVO) + for _, accountpunishment := range list { + mid := util.DerefInt64(accountpunishment.Mid) + if voMap[mid] != nil { + voMap[mid].List = append(voMap[mid].List, accountpunishment) + } else { + vo := &accountpunishmentproto.OpAccountPunishmentVO{ + Account: &accountproto.OpListVO{}, + List: make([]*dbstruct.AccountPunishment, 0), + } + vo.Account.CopyAccount(acctMap[mid]) + vo.List = append(vo.List, accountpunishment) + volist = append(volist, vo) + voMap[mid] = vo + } + } + + return +} + +func (s *Service) OpGetTerminatedAccountPunishmentList(ctx *gin.Context, req *accountpunishmentproto.OpListTerminatedReq) (volist []*accountpunishmentproto.OpAccountPunishmentVO, ec errcode.ErrCode) { + ec = errcode.ErrCodeAccountPunishmentSrvOk + + if ec = s.OpGetTerminatedAccountPunishmentListBusinessValidate(ctx, req); ec != errcode.ErrCodeAccountPunishmentSrvOk { + return + } + + list, err := _DefaultAccountPunishment.OpListTerminated(ctx, req) + if err != nil { + logger.Error("OpGetAccountPunishmentList fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountPunishmentSrvFail + return + } + + // 获取mid的set + midMap := make(map[int64]*dbstruct.Account) + midSet := make([]int64, 0) + for _, v := range list { + mid := util.DerefInt64(v.Mid) + if midMap[mid] != nil { + continue + } else { + midSet = append(midSet, mid) + midMap[mid] = &dbstruct.Account{} + } + } + + // 查询mid的map + acctMap, err := _DefaultAccount.GetAccountMapByMids(ctx, midSet) + if err != nil { + logger.Error("GetAccountMapByMids fail, req: %v, err: %v", util.ToJson(req), err) + ec = errcode.ErrCodeAccountSrvFail + return + } + + // 组装vo + volist = make([]*accountpunishmentproto.OpAccountPunishmentVO, 0) + voMap := make(map[int64]*accountpunishmentproto.OpAccountPunishmentVO) + for _, accountpunishment := range list { + mid := util.DerefInt64(accountpunishment.Mid) + + // 填充状态，不为提前中止，则为正常结束 + if util.DerefInt64(accountpunishment.Status) != consts.AccountPunishment_Interrupted { + accountpunishment.Status = goproto.Int64(consts.AccountPunishment_Finished) + } + + if voMap[mid] != nil { + voMap[mid].List = append(voMap[mid].List, accountpunishment) + } else { + vo := &accountpunishmentproto.OpAccountPunishmentVO{ + Account: &accountproto.OpListVO{}, + List: make([]*dbstruct.AccountPunishment, 0), + } + vo.Account.CopyAccount(acctMap[mid]) + vo.List = append(vo.List, accountpunishment) + volist = append(volist, vo) + voMap[mid] = vo + } + } + + return +} diff --git a/codecreate/codecreate.go b/codecreate/codecreate.go index 9967cceb..52c5b8bc 100644 --- a/codecreate/codecreate.go +++ b/codecreate/codecreate.go @@ -9,10 +9,10 @@ import ( func main() { genSource := &generator.GenSource{ - EntityName: "MomentAuditTask", - ModuleName: "moment_audit_task", - EntityCNName: "动态审核任务表", - ErrCodeSeq: "28", + EntityName: "AccountPunishment", + ModuleName: "accountpunishment", + EntityCNName: "账号处罚", + ErrCodeSeq: "32", } generator.CreateFileDirectory(genSource) diff --git a/codecreate/consts/consts.go b/codecreate/consts/consts.go index 39e71ce4..77b1ceaf 100644 --- a/codecreate/consts/consts.go +++ b/codecreate/consts/consts.go @@ -1,7 +1,7 @@ package consts // root -const RootPath = "/Users/PC/Desktop/wishpal_ironfan_service/service/" +const RootPath = "/Users/PC/Desktop/service/" const ExcelPath = "codecreate/resource/EntityDefine.xlsx" diff --git a/codecreate/resource/EntityDefine.xlsx b/codecreate/resource/EntityDefine.xlsx index 8161387ded7ca34d605a7ad78114aa6a49587f66..2f9190324c0026772131d419835897632b37c2ff 100644 GIT binary patch delta 9778 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 delta 8677 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 Nwx>sIChs4o{{u{G$}<1} diff --git a/codecreate/template/mongo.txt b/codecreate/template/mongo.txt index 3401bf68..1969c3d9 100644 --- a/codecreate/template/mongo.txt +++ b/codecreate/template/mongo.txt @@ -49,20 +49,3 @@ func (m *Mongo) Get#{EntityName}List(ctx *gin.Context, req *#{moduleName}proto.O } return list, err } - -func (m *Mongo) Get#{EntityName}ListByIds(ctx *gin.Context, ids []int64) ([]*dbstruct.#{EntityName}, error) { - list := make([]*dbstruct.#{EntityName}, 0) - col := m.getCol#{EntityName}() - query := qmgo.M{ - "_id": bson.M{ - "$in": ids, - }, - "del_flag": 0, - } - err := col.Find(ctx, query).All(&list) - if err == qmgo.ErrNoSuchDocuments { - err = nil - return list, err - } - return list, err -} \ No newline at end of file diff --git a/dbstruct/accountpunishment.go b/dbstruct/accountpunishment.go new file mode 100644 index 00000000..d00030e6 --- /dev/null +++ b/dbstruct/accountpunishment.go @@ -0,0 +1,25 @@ +package dbstruct + +import ( + "service/bizcommon/util" + "time" +) + +type AccountPunishment struct { + Id *int64 `json:"id" bson:"_id"` // 账号处罚表id + Mid *int64 `json:"mid" bson:"mid"` // 用户表id + Type *int64 `json:"type" bson:"type"` // 处罚类型 + Duration *int64 `json:"duration" bson:"duration"` // 处罚时长 + EndTime *int64 `json:"end_time" bson:"end_time"` // 处罚结束时间 + Status *int64 `json:"status" bson:"status"` // 处罚结果 + Ct *int64 `json:"ct" bson:"ct"` // 创建时间 + Ut *int64 `json:"ut" bson:"ut"` // 更新时间 + DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记 +} + +func (p *AccountPunishment) GetEndTimeFormatString() string { + if p == nil || p.EndTime == nil { + return "" + } + return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("2006年1月2日 15时04分05秒") +} diff --git a/dbstruct/idSeq.go b/dbstruct/idSeq.go index 07a0ab78..fa3cf2c8 100644 --- a/dbstruct/idSeq.go +++ b/dbstruct/idSeq.go @@ -52,3 +52,7 @@ type FeedbackIdSeq struct { type MediaIdSeq struct { Seq int64 `json:"seq" bson:"seq"` } + +type AccountPunishmentIdSeq struct { + Seq int64 //用户Id序列号 +} diff --git a/etc/mix/mix-test.yaml b/etc/mix/mix-test.yaml index 5efaa1bb..cd30bb7f 100644 --- a/etc/mix/mix-test.yaml +++ b/etc/mix/mix-test.yaml @@ -22,7 +22,7 @@ mix_mongo: mix_mysql: uri: "127.0.0.1:3306" username: "root" - password: "Xbz@114514" + password: "Wishpal@2023" timeout: 3 read_timeout_s: 5 write_timeout_s: 3 -- 2.41.0 From 3d0dbb6ca242458f5f6e08865bbfb3c38c08c827 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Wed, 13 Mar 2024 16:31:51 +0800 Subject: [PATCH 2/5] by Robin at 20240313; alter msg for permanent block --- api/errcode/errcode.go | 16 +++++++++------- app/mix/service/apiservice.go | 12 +++++++++--- dbstruct/accountpunishment.go | 9 +++++++++ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 428a6908..86e405b9 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -63,9 +63,10 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeVasAlipayUniTransferFail: "支付宝提现失败", ErrCodeVasOverTodayWithdrawCnt: "今日提现次数到达上限", - ErrCodeMomentSrvFail: "动态服务错误", - ErrCodeMomentNotExist: "动态不存在", - ErrCodMomentBlockedFromCreatingMoment: "该用户的动态创建功能已被封禁至%v", + ErrCodeMomentSrvFail: "动态服务错误", + ErrCodeMomentNotExist: "动态不存在", + ErrCodMomentBlockedFromCreatingMoment: "功能封禁中，截止时间：%v", + ErrCodMomentBlockedFromCreatingMomentPermanently: "该功能已被永久封禁", ErrCodeFootPrintSrvFail: "足迹服务错误", ErrCodeFootPrintNotExist: "足迹不存在", @@ -241,10 +242,11 @@ const ( ErrCodeVasOverTodayWithdrawCnt ErrCode = -7022 // 今天提现次数到达上限 // Moment: 8xxx - ErrCodeMomentSrvOk ErrCode = ErrCodeOk - ErrCodeMomentSrvFail ErrCode = -8001 // 动态服务错误 - ErrCodeMomentNotExist ErrCode = -8002 // 动态不存在 - ErrCodMomentBlockedFromCreatingMoment ErrCode = -8003 // 动态创建已被封禁 + ErrCodeMomentSrvOk ErrCode = ErrCodeOk + ErrCodeMomentSrvFail ErrCode = -8001 // 动态服务错误 + ErrCodeMomentNotExist ErrCode = -8002 // 动态不存在 + ErrCodMomentBlockedFromCreatingMoment ErrCode = -8003 // 动态创建已被封禁 + ErrCodMomentBlockedFromCreatingMomentPermanently ErrCode = -8004 // 动态创建已被永久封禁 // FootPrint: 9xxx ErrCodeFootPrintSrvOk ErrCode = ErrCodeOk diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index b9f66af3..01e88544 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -1581,9 +1581,15 @@ func (s *Service) ApiCreateMoment(ctx *gin.Context, req *momentproto.ApiCreateRe var accountpunishment *dbstruct.AccountPunishment if ec, accountpunishment = s.ApiCreateMomentBusinessValidate(ctx, req); ec != errcode.ErrCodeMomentSrvOk { if ec == errcode.ErrCodeAccountPunishmentExist { - ec = errcode.ErrCodMomentBlockedFromCreatingMoment - acctPunEndTime = accountpunishment.GetEndTimeFormatString() - return + if accountpunishment.IsPermanent() { + ec = errcode.ErrCodMomentBlockedFromCreatingMomentPermanently + return + } else { + ec = errcode.ErrCodMomentBlockedFromCreatingMoment + acctPunEndTime = accountpunishment.GetEndTimeFormatString() + return + } + } return } diff --git a/dbstruct/accountpunishment.go b/dbstruct/accountpunishment.go index d00030e6..03e15930 100644 --- a/dbstruct/accountpunishment.go +++ b/dbstruct/accountpunishment.go @@ -5,6 +5,8 @@ import ( "time" ) +const PermanentDuration int64 = 3155760000 + type AccountPunishment struct { Id *int64 `json:"id" bson:"_id"` // 账号处罚表id Mid *int64 `json:"mid" bson:"mid"` // 用户表id @@ -23,3 +25,10 @@ func (p *AccountPunishment) GetEndTimeFormatString() string { } return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("2006年1月2日 15时04分05秒") } + +func (p *AccountPunishment) IsPermanent() bool { + if p == nil || p.Duration == nil { + return false + } + return util.DerefInt64(p.Duration) == PermanentDuration +} -- 2.41.0 From 2b5396d96b42fcfea56c48de638ae6419e22c5fc Mon Sep 17 00:00:00 2001 From: Leufolium Date: Mon, 18 Mar 2024 23:34:49 +0800 Subject: [PATCH 3/5] by robin at 20240318; alter text for punishing --- dbstruct/accountpunishment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbstruct/accountpunishment.go b/dbstruct/accountpunishment.go index 03e15930..9588743a 100644 --- a/dbstruct/accountpunishment.go +++ b/dbstruct/accountpunishment.go @@ -23,7 +23,7 @@ func (p *AccountPunishment) GetEndTimeFormatString() string { if p == nil || p.EndTime == nil { return "" } - return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("2006年1月2日 15时04分05秒") + return time.Unix(util.DerefInt64(p.EndTime), 0).Local().Format("1/2 15:04") } func (p *AccountPunishment) IsPermanent() bool { -- 2.41.0 From ec2bad2abf8ef31734c4a1c12af8416d41c1dfeb Mon Sep 17 00:00:00 2001 From: Leufolium Date: Mon, 18 Mar 2024 23:36:53 +0800 Subject: [PATCH 4/5] by --- api/errcode/errcode.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/errcode/errcode.go b/api/errcode/errcode.go index 86e405b9..f3222664 100644 --- a/api/errcode/errcode.go +++ b/api/errcode/errcode.go @@ -65,7 +65,7 @@ var ErrCodeMsgMap = map[ErrCode]string{ ErrCodeMomentSrvFail: "动态服务错误", ErrCodeMomentNotExist: "动态不存在", - ErrCodMomentBlockedFromCreatingMoment: "功能封禁中，截止时间：%v", + ErrCodMomentBlockedFromCreatingMoment: "功能封禁中，截止时间：%s", ErrCodMomentBlockedFromCreatingMomentPermanently: "该功能已被永久封禁", ErrCodeFootPrintSrvFail: "足迹服务错误", -- 2.41.0 From d2f961a2d4e2839f184ed0813221a9e80a3b4290 Mon Sep 17 00:00:00 2001 From: Leufolium Date: Mon, 18 Mar 2024 23:51:31 +0800 Subject: [PATCH 5/5] 1 --- app/mix/controller/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index 015d6a13..12e0b4ac 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -455,7 +455,7 @@ func ReplyErrCodeMsgAndDetail(ctx *gin.Context, ec errcode.ErrCode, params ...an ctx.AbortWithStatusJSON(http.StatusOK, base.BaseResponse{ Ret: consts.RetCodeFail, ErrCode: ec, - Msg: fmt.Sprintf(errcode.ErrCodeMsgMap[ec], params), + Msg: fmt.Sprintf(errcode.ErrCodeMsgMap[ec], params...), }) } -- 2.41.0