aa

business/jxstore/cms/job.go

@@ -439,7 +439,7 @@ func AcceptJob(ctx *jxcontext.Context, jobID, dropShippingDeliveryID, dropShippi
 			return
 		}
 		dao.Commit(db, txDB)
-	} else {
+	} else if job.JobCategoryID != model.JobCategoryIDUnion {
 		//任务限时完成
 		timer := checkLimitJobOrders(db, job, jobOrder, model.JobTimerTypeAccept)
 		JobTimers.s.Lock()
@@ -1951,16 +1951,19 @@ func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (actList []*
 
 func ShareUnionLink(ctx *jxcontext.Context, jobID, linkType int) (link string, err error) {
 	var (
-		db  = dao.GetDB()
-		job = &model.Job{}
+		db       = dao.GetDB()
+		job      = &model.Job{}
+		jobOrder = &model.JobOrder{}
 	)
 	job.ID = jobID
 	err = dao.GetEntity(db, job)
 	if err != nil {
 		return link, err
 	}
+	jobOrder.JobID = job.ID
+	err = dao.GetEntity(db, jobOrder, "JobID")
 	if handler := partner.GetHandler(job.VendorID); handler != nil {
-		handler.ShareUnionLink(ctx, linkType)
+		handler.ShareUnionLink(ctx, linkType, job.UnionActID, jobOrder.UserID)
 	}
 	return link, err
 }