diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 246b359c2..4a20c524e 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -1570,12 +1570,14 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro db = dao.GetDB() jobExt = &model.JobExt{} job = &model.Job{} + job2 = &model.Job{} ) utils.Map2StructByJson(payload, &jobExt, false) - job.ID = jobExt.ID - dao.GetEntity(db, job) + utils.Map2StructByJson(payload, &job, false) + job2.ID = job.ID + dao.GetEntity(db, job2) fmt.Println(".........................", utils.Format4Output(jobExt, false)) - valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName()) + valid := dao.StrictMakeMapByStructObject(payload, job2, ctx.GetUserName()) fmt.Println(".......................................", utils.Format4Output(valid, false)) if len(valid) > 0 { dao.Begin(db) @@ -1585,12 +1587,12 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro panic(r) } }() - if _, err = dao.UpdateEntityByKV(db, job, valid, nil); err != nil { + if _, err = dao.UpdateEntityByKV(db, job2, valid, nil); err != nil { dao.Rollback(db) return err } if len(jobExt.JobSteps) > 0 { - steps, _ := dao.GetJobSteps(db, job.ID) + steps, _ := dao.GetJobSteps(db, job2.ID) for _, v := range steps { v.DeletedAt = time.Now() dao.UpdateEntity(db, v, "DeletedAt") @@ -1601,7 +1603,7 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro } } if len(jobExt.JobImgs) > 0 { - imgs, _ := dao.GetJobImgs(db, job.ID) + imgs, _ := dao.GetJobImgs(db, job2.ID) for _, v := range imgs { dao.DeleteEntity(db, v) } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index a5d76ee5a..9a3636b6f 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -259,7 +259,7 @@ func GetPayStatistics(db *DaoDB, userID string, pop int, cityCodes []int, mobile rSQL3, rSQLParams3 := getFromSql(model.OrderTypeCash, model.OrderStatusFinished, "t3", userID, pop, cityCodes, mobile, fromTime, toTime, orderTypes) sql += rSQL3 + "," sqlParams = append(sqlParams, rSQLParams3...) - sql += `(SELECT SUM(IFNULL(b.account_balance,0)) account_balacne + sql += `(SELECT SUM(IFNULL(b.account_balance,0)) account_balance FROM user a JOIN user_bill b ON a.user_id = b.user_id `