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

BY

This commit is contained in:
Leufolium 2024-05-01 04:09:27 +08:00
parent 138a8da41d
commit d8527b01b1
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/proto/zone/proto/zone_op.go
View File

@ -61,9 +61,9 @@ type OpListReq struct {
} }
type OpListData struct { type OpListData struct {
List []*dbstruct.Zone `json:"list"` List []*OpZoneVO `json:"list"`
Offset int `json:"offset"` Offset int `json:"offset"`
More int `json:"more"` More int `json:"more"`
} }
type OpListResp struct { type OpListResp struct {

1
api/proto/zonemoment/proto/not_null_def_op.go
View File

@ -80,6 +80,7 @@ func (p *OpSetPrivateReq) ProvideNotNullValue() (params []*validator.JsonParam)
params = make([]*validator.JsonParam, 0) params = make([]*validator.JsonParam, 0)
params = append(params, validator.NewInt64PtrParam("请确认待审批动态的id！", p.ZoneMomentId)) params = append(params, validator.NewInt64PtrParam("请确认待审批动态的id！", p.ZoneMomentId))
params = append(params, validator.NewStringParam("请确认人工审批意见！", p.ManuallyReviewOpinion))
return return
} }

3
api/proto/zonemoment/proto/zonemoment_op.go
View File

@ -213,7 +213,8 @@ type OpHeadResp struct {
// op 退回动态 // op 退回动态
type OpSetPrivateReq struct { type OpSetPrivateReq struct {
base.BaseRequest base.BaseRequest
ZoneMomentId *int64 `json:"zone_moment_id"` ZoneMomentId *int64 `json:"zone_moment_id"`
ManuallyReviewOpinion string `json:"manually_review_opinion"`
} }
type OpSetPrivateData struct { type OpSetPrivateData struct {

17
app/mix/service/service.go
View File

@ -3215,7 +3215,7 @@ func (s *Service) OpDeleteZone(ctx *gin.Context, id int64) (ec errcode.ErrCode)
return return
} }
func (s *Service) OpGetZoneList(ctx *gin.Context, req *zoneproto.OpListReq) (list []*dbstruct.Zone, ec errcode.ErrCode) { func (s *Service) OpGetZoneList(ctx *gin.Context, req *zoneproto.OpListReq) (volist []*zoneproto.OpZoneVO, ec errcode.ErrCode) {
ec = errcode.ErrCodeZoneSrvOk ec = errcode.ErrCodeZoneSrvOk
list, err := _DefaultZone.OpList(ctx, req) list, err := _DefaultZone.OpList(ctx, req)
if err != nil { if err != nil {
@ -3223,6 +3223,15 @@ func (s *Service) OpGetZoneList(ctx *gin.Context, req *zoneproto.OpListReq) (lis
ec = errcode.ErrCodeZoneSrvFail ec = errcode.ErrCodeZoneSrvFail
return return
} }
// 填充必要信息
volist, err = s.utilFillZonesWithOpVOInfo(ctx, list)
if err != nil {
logger.Error("utilFillZonesWithOpVOInfo fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeZoneSrvFail
return
}
return return
} }
@ -3654,8 +3663,10 @@ func (s *Service) OpSetPrivateZoneMoment(ctx *gin.Context, req *zonemomentproto.
// 更新动态的状态 // 更新动态的状态
err = _DefaultZoneMoment.OpUpdate(ctx, &zonemomentproto.OpUpdateReq{ err = _DefaultZoneMoment.OpUpdate(ctx, &zonemomentproto.OpUpdateReq{
ZoneMoment: &dbstruct.ZoneMoment{ ZoneMoment: &dbstruct.ZoneMoment{
Id: req.ZoneMomentId, Id: req.ZoneMomentId,
Status: goproto.Int64(consts.ZoneMoment_Private), Status: goproto.Int64(consts.ZoneMoment_Private),
ManuallyReviewStatus: goproto.Int64(consts.ZoneMomentManuallyReview_Rejected),
ManuallyReviewOpinion: goproto.String(req.ManuallyReviewOpinion),
}, },
}) })
if err != nil { if err != nil {