Merge branch 'feat-IRONFANS-70' into test
This commit is contained in:
commit
5467be4a52
|
@ -2392,7 +2392,7 @@ func (s *Service) ApiCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.Api
|
|||
req.ZoneMoment.TextAuditStatus = goproto.Int64(consts.TextAudit_Created) // 创建
|
||||
req.ZoneMoment.ManuallyReviewStatus = goproto.Int64(consts.ZoneMomentManuallyReview_Waiting) // 等待复审
|
||||
|
||||
err, momentId := _DefaultZoneMoment.OpCreate(ctx, &zonemomentproto.OpCreateReq{
|
||||
momentId, err := _DefaultZoneMoment.OpCreate(ctx, &zonemomentproto.OpCreateReq{
|
||||
BaseRequest: req.BaseRequest,
|
||||
ZoneMoment: req.ZoneMoment,
|
||||
})
|
||||
|
|
|
@ -23,13 +23,13 @@ func NewZoneMoment(store *dao.Store) (a *ZoneMoment) {
|
|||
return
|
||||
}
|
||||
|
||||
func (p *ZoneMoment) OpCreate(ctx *gin.Context, req *zonemomentproto.OpCreateReq) (error, int64) {
|
||||
func (p *ZoneMoment) OpCreate(ctx *gin.Context, req *zonemomentproto.OpCreateReq) (int64, error) {
|
||||
|
||||
//产生zid
|
||||
zoneMomentIdSeq, err := p.store.GetAndUpdateZoneMomentIdSeq(ctx)
|
||||
if err != nil {
|
||||
logger.Error("GetAndUpdateZoneMomentIdSeq failed : %v", err)
|
||||
return err, 0
|
||||
return 0, err
|
||||
}
|
||||
|
||||
req.ZoneMoment.Id = goproto.Int64(zoneMomentIdSeq.Seq)
|
||||
|
@ -40,9 +40,9 @@ func (p *ZoneMoment) OpCreate(ctx *gin.Context, req *zonemomentproto.OpCreateReq
|
|||
err = p.store.CreateZoneMoment(ctx, req.ZoneMoment)
|
||||
if err != nil {
|
||||
logger.Error("CreateZoneMoment fail, err: %v", err)
|
||||
return err, 0
|
||||
return 0, err
|
||||
}
|
||||
return nil, zoneMomentIdSeq.Seq
|
||||
return zoneMomentIdSeq.Seq, nil
|
||||
}
|
||||
|
||||
func (p *ZoneMoment) OpUpdate(ctx *gin.Context, req *zonemomentproto.OpUpdateReq) error {
|
||||
|
|
|
@ -3205,7 +3205,7 @@ func (s *Service) OpCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.OpCr
|
|||
}
|
||||
req.ZoneMoment.TextAuditStatus = goproto.Int64(consts.TextAudit_Created) // 创建
|
||||
req.ZoneMoment.ManuallyReviewStatus = goproto.Int64(consts.ZoneMomentManuallyReview_Waiting) // 等待复审
|
||||
err, _ := _DefaultZoneMoment.OpCreate(ctx, req)
|
||||
_, err := _DefaultZoneMoment.OpCreate(ctx, req)
|
||||
if err != nil {
|
||||
logger.Error("OpCreate fail, req: %v, err: %v", util.ToJson(req), err)
|
||||
ec = errcode.ErrCodeZoneMomentSrvFail
|
||||
|
|
Loading…
Reference in New Issue