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 15:27:09 +08:00
parent 59d8c30d91
commit 7f2a3c5133
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1570,12 +1570,14 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
db = dao.GetDB() db = dao.GetDB()
jobExt = &model.JobExt{} jobExt = &model.JobExt{}
job = &model.Job{} job = &model.Job{}
job2 = &model.Job{}
) )
utils.Map2StructByJson(payload, &jobExt, false) utils.Map2StructByJson(payload, &jobExt, false)
job.ID = jobExt.ID utils.Map2StructByJson(payload, &job, false)
dao.GetEntity(db, job) job2.ID = job.ID
dao.GetEntity(db, job2)
fmt.Println(".........................", utils.Format4Output(jobExt, false)) 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)) fmt.Println(".......................................", utils.Format4Output(valid, false))
if len(valid) > 0 { if len(valid) > 0 {
dao.Begin(db) dao.Begin(db)
@@ -1585,12 +1587,12 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
panic(r) 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) dao.Rollback(db)
return err return err
} }
if len(jobExt.JobSteps) > 0 { if len(jobExt.JobSteps) > 0 {
steps, _ := dao.GetJobSteps(db, job.ID) steps, _ := dao.GetJobSteps(db, job2.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")
@@ -1601,7 +1603,7 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
} }
} }
if len(jobExt.JobImgs) > 0 { if len(jobExt.JobImgs) > 0 {
imgs, _ := dao.GetJobImgs(db, job.ID) imgs, _ := dao.GetJobImgs(db, job2.ID)
for _, v := range imgs { for _, v := range imgs {
dao.DeleteEntity(db, v) dao.DeleteEntity(db, v)
} }

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

@@ -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) rSQL3, rSQLParams3 := getFromSql(model.OrderTypeCash, model.OrderStatusFinished, "t3", userID, pop, cityCodes, mobile, fromTime, toTime, orderTypes)
sql += rSQL3 + "," sql += rSQL3 + ","
sqlParams = append(sqlParams, rSQLParams3...) 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 FROM user a
JOIN user_bill b ON a.user_id = b.user_id JOIN user_bill b ON a.user_id = b.user_id
` `