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:
苏尹岚
2020-12-31 13:46:23 +08:00
parent ef5a6161d3
commit 8434c19887
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,14 +316,18 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
// if num >= AcceptMaxCount { // if num >= AcceptMaxCount {
// return 0, errCode, fmt.Errorf("每人最多接取" + utils.Int2Str(AcceptMaxCount) + "个任务，请核实！") // return 0, errCode, fmt.Errorf("每人最多接取" + utils.Int2Str(AcceptMaxCount) + "个任务，请核实！")
// } // }
num, err = checkJobOrders(db, jobID, "<= "+utils.Int2Str(model.JobOrderStatusWaitAudit), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) //非快递任务
if num > 0 { if jobID != 2 {
return 0, errCode, fmt.Errorf("您还有此任务未完成，请完成后再接取！") num, err = checkJobOrders(db, jobID, "<= "+utils.Int2Str(model.JobOrderStatusWaitAudit), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)
} if num > 0 {
num, err = checkJobOrders(db, jobID, "= "+utils.Int2Str(model.JobOrderStatusAuditUnPass), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) return 0, errCode, fmt.Errorf("您还有此任务未完成，请完成后再接取！")
if num > 0 { }
return 0, errCode, fmt.Errorf("您还有此任务未审核通过记录，可直接在未审核中重新提交！") num, err = checkJobOrders(db, jobID, "= "+utils.Int2Str(model.JobOrderStatusAuditUnPass), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)
if num > 0 {
return 0, errCode, fmt.Errorf("您还有此任务未审核通过记录，可直接在未审核中重新提交！")
}
} }
switch job.LimitCountType { switch job.LimitCountType {
case model.JobLimitCountTypePO: case model.JobLimitCountTypePO:
num, err = checkJobOrders(db, jobID, "<> "+utils.Int2Str(model.JobOrderStatusCancel), userID, utils.ZeroTimeValue, utils.ZeroTimeValue) num, err = checkJobOrders(db, jobID, "<> "+utils.Int2Str(model.JobOrderStatusCancel), userID, utils.ZeroTimeValue, utils.ZeroTimeValue)