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-14 11:16:40 +08:00
parent deb0e60a06
commit 22a05e2cef
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,7 +413,16 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
dao.Rollback(db) dao.Rollback(db)
return return
} }
dao.Commit(db)
if job.JobCategoryID == model.JobCategoryIDDropShipping { if job.JobCategoryID == model.JobCategoryIDDropShipping {
dao.Begin(db)
defer func() {
if r := recover(); r != nil {
dao.Rollback(db)
panic(r)
}
}()
if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeDropShipping, jobOrder.UserActualPrice, job.ID); err != nil { if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeDropShipping, jobOrder.UserActualPrice, job.ID); err != nil {
dao.Rollback(db) dao.Rollback(db)
return return
@@ -423,6 +432,7 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
dao.Rollback(db) dao.Rollback(db)
return return
} }
dao.Commit(db)
} else { } else {
//任务限时完成 //任务限时完成
timer := checkLimitJobOrders(db, job, jobOrder, model.JobTimerTypeAccept) timer := checkLimitJobOrders(db, job, jobOrder, model.JobTimerTypeAccept)
@@ -430,7 +440,6 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
JobTimers.JobTimerMap[jobOrder.JobOrderID] = timer JobTimers.JobTimerMap[jobOrder.JobOrderID] = timer
JobTimers.s.Unlock() JobTimers.s.Unlock()
} }
dao.Commit(db)
return jobOrder.JobOrderID, errCode, err return jobOrder.JobOrderID, errCode, err
} }