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:
苏尹岚
2021-01-04 14:47:14 +08:00
parent 6ce886212f
commit c659732c5d
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,12 +166,12 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
dao.Rollback(db) dao.Rollback(db)
return return
} }
for _, v := range job.JobSteps { for _, v := range jobExt.JobSteps {
dao.WrapAddIDCULDEntity(v, ctx.GetUserName()) dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
v.JobID = job.ID v.JobID = job.ID
err = dao.CreateEntity(db, v) err = dao.CreateEntity(db, v)
} }
for _, v := range job.JobImgs { for _, v := range jobExt.JobImgs {
dao.WrapAddIDCULEntity(v, ctx.GetUserName()) dao.WrapAddIDCULEntity(v, ctx.GetUserName())
v.JobID = job.ID v.JobID = job.ID
err = dao.CreateEntity(db, v) err = dao.CreateEntity(db, v)
@@ -1567,10 +1567,14 @@ func AddressDistinguish(ctx *jxcontext.Context, address string) (result *txcloud
func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err error) { func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err error) {
var ( var (
db = dao.GetDB() db = dao.GetDB()
job = &model.Job{} jobExt = &model.JobExt{}
job = &model.Job{}
) )
utils.Map2StructByJson(payload, &job, false) utils.Map2StructByJson(payload, &jobExt, false)
if data, err := json.Marshal(jobExt); err == nil {
json.Unmarshal(data, &job)
}
valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName()) valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName())
if len(valid) > 0 { if len(valid) > 0 {
dao.Begin(db) dao.Begin(db)
@@ -1584,23 +1588,23 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
dao.Rollback(db) dao.Rollback(db)
return err return err
} }
if len(job.JobSteps) > 0 { if len(jobExt.JobSteps) > 0 {
steps, _ := dao.GetJobSteps(db, job.ID) steps, _ := dao.GetJobSteps(db, job.ID)
for _, v := range steps { for _, v := range steps {
v.DeletedAt = time.Now() v.DeletedAt = time.Now()
dao.UpdateEntity(db, v, "DeletedAt") dao.UpdateEntity(db, v, "DeletedAt")
} }
if err = dao.CreateMultiEntities(db, job.JobSteps); err != nil { if err = dao.CreateMultiEntities(db, jobExt.JobSteps); err != nil {
dao.Rollback(db) dao.Rollback(db)
return err return err
} }
} }
if len(job.JobImgs) > 0 { if len(jobExt.JobImgs) > 0 {
imgs, _ := dao.GetJobImgs(db, job.ID) imgs, _ := dao.GetJobImgs(db, job.ID)
for _, v := range imgs { for _, v := range imgs {
dao.DeleteEntity(db, v) dao.DeleteEntity(db, v)
} }
if err = dao.CreateMultiEntities(db, job.JobImgs); err != nil { if err = dao.CreateMultiEntities(db, jobExt.JobImgs); err != nil {
dao.Rollback(db) dao.Rollback(db)
return err return err
} }

2
business/model/dao/dao_job.go
View File

@@ -32,7 +32,7 @@ func GetJobCategories(db *DaoDB, name string) (jobCategories []*model.JobCategor
} }
type GetJobsResult struct { type GetJobsResult struct {
model.Job model.JobExt
CategoryName string `json:"categoryName"` //分类名 CategoryName string `json:"categoryName"` //分类名
IndexImg string `json:"indexImg"` //任务封面 IndexImg string `json:"indexImg"` //任务封面
Distance float64 `json:"distance"` //距用户距离 Distance float64 `json:"distance"` //距用户距离

2
business/model/dao/dao_order.go
View File

@@ -211,7 +211,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile
sql += ` sql += `
(SELECT SUM(IFNULL(b.pay_price,0)) total_pay (SELECT SUM(IFNULL(b.pay_price,0)) total_pay
FROM user a FROM user a
JOIN ` + "`order` b" + `ON b.user_id = a.user_id AND b.type = ? AND b.status = ? ` + getWhereSql(sqlP) + ` JOIN ` + "`order` b " + `ON b.user_id = a.user_id AND b.type = ? AND b.status = ? ` + getWhereSql(sqlP) + `
` `
sqlP = append(sqlP, orderType, status) sqlP = append(sqlP, orderType, status)
if mobile != "" { if mobile != "" {

6
business/model/job.go
View File

@@ -122,8 +122,8 @@ type Job struct {
SkuURL string `orm:"column(sku_url)" json:"skuURL"` //商品优惠券链接 SkuURL string `orm:"column(sku_url)" json:"skuURL"` //商品优惠券链接
Type int `json:"type"` //任务类型，0为普通任务，1为特殊任务 Type int `json:"type"` //任务类型，0为普通任务，1为特殊任务
BrowseCount int `json:"browseCount"` //任务浏览量，点一下加一下 BrowseCount int `json:"browseCount"` //任务浏览量，点一下加一下
JobSteps []*JobStep `orm:"-" json:"jobSteps"` // JobSteps []*JobStep `orm:"-" json:"jobSteps"`
JobImgs []*JobImg `orm:"-" json:"jobImgs"` // JobImgs []*JobImg `orm:"-" json:"jobImgs"`
} }
func (v *Job) TableIndex() [][]string { func (v *Job) TableIndex() [][]string {
@@ -136,6 +136,8 @@ func (v *Job) TableIndex() [][]string {
type JobExt struct { type JobExt struct {
FinishedAtStr string `json:"finishedAtStr"` //接单截止日期 FinishedAtStr string `json:"finishedAtStr"` //接单截止日期
Job Job
JobSteps []*JobStep `orm:"-" json:"jobSteps"`
JobImgs []*JobImg `orm:"-" json:"jobImgs"`
} }
type JobImg struct { type JobImg struct {