This commit is contained in:
苏尹岚
2021-01-04 15:45:31 +08:00
parent a3e80c306c
commit ccdc532142

View File

@@ -708,12 +708,12 @@ func AuditJob(ctx *jxcontext.Context, jobOrderID, status int, comment, vendorWay
userBillJobOrder, err := dao.GetUserBill(db, jobOrder.UserID, "") userBillJobOrder, err := dao.GetUserBill(db, jobOrder.UserID, "")
//系统消息 //系统消息
content := new(strings.Builder) content := new(strings.Builder)
content.WriteString("您接取的任务:") content.WriteString("恭喜您完成了任务:")
content.WriteString(job.Title) content.WriteString(job.Title)
if ctx.GetUserName() == "jxadmin" { if ctx.GetUserName() == "jxadmin" {
content.WriteString(",因超时未审核已被系统自动审核") content.WriteString(",因超时未审核已被系统自动审核")
} else { } else {
content.WriteString("已被审核") content.WriteString("商家已经审核")
} }
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {
@@ -796,7 +796,7 @@ func AuditJob(ctx *jxcontext.Context, jobOrderID, status int, comment, vendorWay
} }
} }
} else { } else {
content.WriteString("不通过,请确认") content.WriteString("不通过,请您修改后重新提交")
if job.Status < 0 { if job.Status < 0 {
if job.CashbackType == model.JobCashbackPrice { if job.CashbackType == model.JobCashbackPrice {
userBill, err := dao.GetUserBill(db, job.UserID, "") userBill, err := dao.GetUserBill(db, job.UserID, "")
@@ -1575,7 +1575,6 @@ func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err erro
job2.ID = int(utils.MustInterface2Int64(payload["id"])) job2.ID = int(utils.MustInterface2Int64(payload["id"]))
dao.GetEntity(db, job2) dao.GetEntity(db, job2)
valid := dao.StrictMakeMapByStructObject(payload, job2, ctx.GetUserName()) valid := dao.StrictMakeMapByStructObject(payload, job2, ctx.GetUserName())
fmt.Println(".......................................", utils.Format4Output(valid, false))
if len(valid) > 0 { if len(valid) > 0 {
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {