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

Merge pull request 'by Robin at 20240711' (#612) from feat-IRONFANS-148-Robin into test 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/612
This commit is contained in:
chenhao 2024-07-11 14:56:00 +08:00
parent ae43a7baa5 f03f172a8d
commit 2298b4f4e1
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mix/dao/mongo.go
View File

@ -2479,7 +2479,7 @@ func (m *Mongo) GetStreamerAuthApprovalBasicHisList(ctx *gin.Context, req *strea
list := make([]*dbstruct.StreamerAuthApprovalBasic, 0) list := make([]*dbstruct.StreamerAuthApprovalBasic, 0)
col := m.getColStreamerAuthApprovalBasicHis() col := m.getColStreamerAuthApprovalBasicHis()
query := qmgo.M{ query := qmgo.M{
"del_flag": 0, "del_flag": consts.Deleted,
} }
if req.ApproveStatus != nil { if req.ApproveStatus != nil {
query["approve_status"] = util.DerefInt64(req.ApproveStatus) query["approve_status"] = util.DerefInt64(req.ApproveStatus)
@ -2496,7 +2496,7 @@ func (m *Mongo) GetStreamerAuthApprovalBasicHisListByMid(ctx *gin.Context, req *
list := make([]*dbstruct.StreamerAuthApprovalBasic, 0) list := make([]*dbstruct.StreamerAuthApprovalBasic, 0)
col := m.getColStreamerAuthApprovalBasicHis() col := m.getColStreamerAuthApprovalBasicHis()
query := qmgo.M{ query := qmgo.M{
"del_flag": 0, "del_flag": consts.Deleted,
} }
if req.ApproveStatus != nil { if req.ApproveStatus != nil {
query["approve_status"] = util.DerefInt64(req.ApproveStatus) query["approve_status"] = util.DerefInt64(req.ApproveStatus)

2
app/mix/service/apiservice_business_validation.go
View File

@ -486,6 +486,8 @@ func (s *Service) ApiCreateStreamerAuthApprovalBasicBusinessValidate(ctx *gin.Co
ec = errcode.ErrCodeStreamerAuthApprovalSrvOk ec = errcode.ErrCodeStreamerAuthApprovalSrvOk
result := businessvalidator.NewAuthBusinessValidator(ctx, req). result := businessvalidator.NewAuthBusinessValidator(ctx, req).
QueryAccount(_DefaultAccount.OpListByMid).
EnsureIsThisRole(consts.Streamer).
EnsureMediaIsSuccessfullyUploaded(req.StreamerAuthApprovalBasic.Avatar). EnsureMediaIsSuccessfullyUploaded(req.StreamerAuthApprovalBasic.Avatar).
EnsureMediaIsSuccessfullyUploaded(req.StreamerAuthApprovalBasic.AccountShot). EnsureMediaIsSuccessfullyUploaded(req.StreamerAuthApprovalBasic.AccountShot).
Validate(). Validate().

1
app/mix/service/logic/streamerauthapproval_basic.go
View File

@ -102,6 +102,7 @@ func (p *StreamerAuthApprovalBasic) OpDeleteBatch(ctx *gin.Context, ids []int64)
//2.原有审核申请标记删除后转存到历史表 //2.原有审核申请标记删除后转存到历史表
for _, streamerauthapprovalbasic := range list { for _, streamerauthapprovalbasic := range list {
streamerauthapprovalbasic.DelFlag = goproto.Int64(consts.Deleted) streamerauthapprovalbasic.DelFlag = goproto.Int64(consts.Deleted)
streamerauthapprovalbasic.ApproveStatus = goproto.Int64(consts.StreamerAuthApprovalBasicApprove_Rejected)
} }
err = p.store.CreateBatchStreamerAuthApprovalBasicHis(ctx, list) err = p.store.CreateBatchStreamerAuthApprovalBasicHis(ctx, list)
if err != nil { if err != nil {

2
app/mix/service/logic/streamerauthapproval_details.go
View File

@ -134,6 +134,8 @@ func (p *StreamerAuthApprovalDetails) OpDeleteBatchByMids(ctx *gin.Context, mids
//2.原有审核申请标记删除后转存到历史表 //2.原有审核申请标记删除后转存到历史表
for _, streamerauthapprovaldetails := range list { for _, streamerauthapprovaldetails := range list {
streamerauthapprovaldetails.DelFlag = goproto.Int64(consts.Deleted) streamerauthapprovaldetails.DelFlag = goproto.Int64(consts.Deleted)
streamerauthapprovaldetails.ApproveStatus = goproto.Int64(consts.StreamerAuthApprovalDetailsApprove_Rejected)
streamerauthapprovaldetails.Status = goproto.Int64(consts.StreamerAuthApprovalDetails_Rejected)
} }
err = p.store.CreateBatchStreamerAuthApprovalDetailsHis(ctx, list) err = p.store.CreateBatchStreamerAuthApprovalDetailsHis(ctx, list)
if err != nil { if err != nil {