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

Merge pull request 'feat-IRONFANS-120-Robin' (#444) from feat-IRONFANS-120-Robin into test 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/444
This commit is contained in:
chenhao 2024-05-16 14:40:50 +08:00
parent f21050d3f2 3a3c50f851
commit 1ddcca1b33
7 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/consts/status.go
View File

@ -242,3 +242,8 @@ const (
const (
DaysElapsedSinceTheLastZonesUpdate_Never = -1
)
const (
IsCreatingPaidText_No = 0 //否
IsCreatingPaidText_Yes = 1 //是
)

4
api/proto/zonemoment/proto/not_null_def_api.go
View File

@ -19,10 +19,6 @@ func (p *ApiCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
case consts.ZoneMomentCType_Paid:
params = append(params, validator.NewInt64PtrParam("请确认创建动态的文字可见范围！", p.ZoneMoment.TextVisibleRange))
params = append(params, validator.NewInt64PtrParam("请确认创建动态的价格！", p.ZoneMoment.Price))
params = append(params, validator.NewInt64PtrParam("请确认是否添加付费文案！", p.ZoneMoment.IsCreatingPaidText))
if p.ZoneMoment.GetIsCreatingPaidText() == 1 {
params = append(params, validator.NewStringPtrParam("请确认创建动态的付费文案!", p.PaidText))
}
switch util.DerefInt64(p.ZoneMoment.MType) {
case consts.MediaTypeImg:
params = append(params, validator.NewInt64PtrParam("请确认创建动态的媒体可见范围！", p.ZoneMoment.MediaVisibleRange))

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

@ -19,10 +19,6 @@ func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
case consts.ZoneMomentCType_Paid:
params = append(params, validator.NewInt64PtrParam("请确认创建动态的文字可见范围！", p.ZoneMoment.TextVisibleRange))
params = append(params, validator.NewInt64PtrParam("请确认创建动态的价格！", p.ZoneMoment.Price))
params = append(params, validator.NewInt64PtrParam("请确认是否添加付费文案！", p.ZoneMoment.IsCreatingPaidText))
if p.ZoneMoment.GetIsCreatingPaidText() == 1 {
params = append(params, validator.NewStringPtrParam("请确认创建动态的付费文案!", p.PaidText))
}
switch util.DerefInt64(p.ZoneMoment.MType) {
case consts.MediaTypeImg:
params = append(params, validator.NewInt64PtrParam("请确认创建动态的媒体可见范围！", p.ZoneMoment.MediaVisibleRange))

12
app/mix/service/apiservice.go
View File

@ -2444,6 +2444,12 @@ func (s *Service) ApiCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.Api
req.ZoneMoment.Zid = zones[0].Id
}
// 拼接付费文案
if req.ZoneMoment.GetIsCreatingPaidText() == consts.IsCreatingPaidText_Yes {
req.ZoneMoment.PaidText = goproto.String("\n" + req.ZoneMoment.GetPaidText())
req.ZoneMoment.Text = goproto.String(req.ZoneMoment.GetText() + req.ZoneMoment.GetPaidText())
}
req.ZoneMoment.Status = goproto.Int64(consts.ZoneMoment_Auditing) // 默认正在审核中
if req.ZoneMoment.MediaComp != nil && len(req.ZoneMoment.MediaComp.GetImageIds()) > 0 {
req.ZoneMoment.ImageAuditStatus = goproto.Int64(consts.ImageAudit_Created) // 创建
@ -2507,6 +2513,12 @@ func (s *Service) ApiUpdateZoneMoment(ctx *gin.Context, req *zonemomentproto.Api
return
}
// 拼接付费文案
if req.ZoneMoment.GetIsCreatingPaidText() == consts.IsCreatingPaidText_Yes {
req.ZoneMoment.PaidText = goproto.String("\n" + req.ZoneMoment.GetPaidText())
req.ZoneMoment.Text = goproto.String(req.ZoneMoment.GetText() + req.ZoneMoment.GetPaidText())
}
zmStatus := zonemoment.GetStatus()
// 抹消审核信息，回退到初始

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

@ -3335,6 +3335,12 @@ func (s *Service) OpGetZoneListByUserId(ctx *gin.Context, req *zoneproto.OpListB
func (s *Service) OpCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.OpCreateReq) (ec errcode.ErrCode) {
ec = errcode.ErrCodeZoneMomentSrvOk
// 拼接付费文案
if req.ZoneMoment.GetIsCreatingPaidText() == consts.IsCreatingPaidText_Yes {
req.ZoneMoment.PaidText = goproto.String("\n" + req.ZoneMoment.GetPaidText())
req.ZoneMoment.Text = goproto.String(req.ZoneMoment.GetText() + req.ZoneMoment.GetPaidText())
}
req.ZoneMoment.Status = goproto.Int64(consts.ZoneMoment_Auditing) // 默认正在审核中
if req.ZoneMoment.MediaComp != nil && len(req.ZoneMoment.MediaComp.GetImageIds()) > 0 {
req.ZoneMoment.ImageAuditStatus = goproto.Int64(consts.ImageAudit_Created) // 创建
@ -3383,6 +3389,12 @@ func (s *Service) OpCreateZoneMoment(ctx *gin.Context, req *zonemomentproto.OpCr
func (s *Service) OpUpdateZoneMoment(ctx *gin.Context, req *zonemomentproto.OpUpdateReq) (ec errcode.ErrCode) {
ec = errcode.ErrCodeZoneMomentSrvOk
// 拼接付费文案
if req.ZoneMoment.GetIsCreatingPaidText() == consts.IsCreatingPaidText_Yes {
req.ZoneMoment.PaidText = goproto.String("\n" + req.ZoneMoment.GetPaidText())
req.ZoneMoment.Text = goproto.String(req.ZoneMoment.GetText() + req.ZoneMoment.GetPaidText())
}
zonemoment, err := _DefaultZoneMoment.GetById(ctx, req.ZoneMoment.GetId())
if err != nil {
logger.Error("_DefaultZoneMoment GetById fail, req: %v, err: %v", util.ToJson(req), err)

3
app/mix/service/utilservice.go
View File

@ -944,6 +944,9 @@ func (s *Service) utilEncryptInaccessibleZoneMoment(vo *zonemomentproto.ApiZoneM
imageIds = imageIds[:mediaVisibleRange]
vo.MediaComp.ImageIds = util.Int64Slice(imageIds)
}
if vo.GetIsCreatingPaidText() == consts.IsCreatingPaidText_Yes {
vo.Text = goproto.String(vo.GetText()[:len(vo.GetText())-len(vo.GetPaidText())])
}
}
// 填充动态是否解锁

14
dbstruct/zonemoment.go
View File

@ -103,3 +103,17 @@ func (p *ZoneMoment) GetIsCreatingPaidText() int64 {
}
return 0
}
func (p *ZoneMoment) GetText() string {
if p != nil && p.Text != nil {
return *p.Text
}
return ""
}
func (p *ZoneMoment) GetPaidText() string {
if p != nil && p.PaidText != nil {
return *p.PaidText
}
return ""
}