liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-05-24 16:26:28 +08:00
parent 29a15b55cd
commit d5f8ab6909
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
business/jxstore/cms/job.go
View File

@@ -1960,8 +1960,8 @@ func TempJob() (err error) {
} }
type GetUnionActListResult struct { type GetUnionActListResult struct {
actList *partner.ActivityList partner.ActivityList
JobID int `orm:"column(job_id)" json:"jobID"` JobID int `orm:"column(job_id)" json:"jobID"`
} }
func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (results []*GetUnionActListResult, err error) { func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (results []*GetUnionActListResult, err error) {
@@ -1969,9 +1969,15 @@ func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (results []*
actList, err2 := handler.GetUnionActList(ctx, actType) actList, err2 := handler.GetUnionActList(ctx, actType)
if err2 == nil { if err2 == nil {
for _, v := range actList { for _, v := range actList {
result := &GetUnionActListResult{ result := &GetUnionActListResult{}
actList: v, result.ActID = v.ActID
} result.Img = v.Img
result.DateEnd = v.DateEnd
result.DateBegin = v.DateBegin
result.ActDes = v.ActDes
result.ActName = v.ActName
result.ActSrc = v.ActSrc
result.Ratio = v.Ratio
var job *model.Job var job *model.Job
sql := ` sql := `
SELECT * FROM job WHERE vendor_id = ? AND union_act_id = ? AND type = ? SELECT * FROM job WHERE vendor_id = ? AND union_act_id = ? AND type = ?