This commit is contained in:
suyl
2021-04-22 16:51:09 +08:00
parent 910e83ea4b
commit 18ebaa41c4
2 changed files with 4 additions and 7 deletions

View File

@@ -1971,10 +1971,9 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType int) (lin
sid string sid string
jobOrderID int64 jobOrderID int64
) )
if shareType == partner.ShareTypeOther { jobOrderID, _, err = AcceptJob(ctx, jobID, 0, 0)
jobOrderID, _, _ = AcceptJob(ctx, jobID, 0, 0) if err != nil {
} else { return "", err
sid = partner.MtUnionJxSID
} }
if jobOrderID != 0 { if jobOrderID != 0 {
sid = utils.Int64ToStr(jobOrderID) sid = utils.Int64ToStr(jobOrderID)

View File

@@ -194,11 +194,9 @@ func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) {
jobOrder = &model.JobOrder{} jobOrder = &model.JobOrder{}
db = dao.GetDB() db = dao.GetDB()
) )
if unionOrder.SID == partner.MtUnionJxSID { if unionOrder.SID == "" {
globals.SugarLogger.Debugf("result UnionOrderCallBack jxsysorder")
return err return err
} }
jobOrder.ID = utils.Str2Int64(unionOrder.SID) jobOrder.ID = utils.Str2Int64(unionOrder.SID)
txDB, _ := dao.Begin(db) txDB, _ := dao.Begin(db)
defer func() { defer func() {