diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 29121952f..b120e706e 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -1978,10 +1978,6 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resource if err = dao.GetEntity(db, job); err != nil { return "", err } - //为了生成一条正在进行中的任务,方便用户查看一些信息 - if _, _, err = AcceptJob(ctx, jobID, 0, 0); err != nil { - return "", err - } vendorID := job.VendorID handler := partner.GetHandler(vendorID) //1、建推广位(本地和平台) @@ -1998,9 +1994,9 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resource } dao.WrapAddIDCULDEntity(userBind, ctx.GetUserName()) if handler != nil { - if sid, err = handler.CreateUnionPosition(ctx, userID); err == nil { + if sid, err = handler.CreateUnionPosition(ctx, userID+utils.Int2Str(jobID)); err == nil { if sid == "" { - sid = userID + sid = userID + utils.Int2Str(jobID) if vendorID == model.VendorIDTB { sid = utils.Int2Str(tbunionapi.JxAdzoneID) } diff --git a/business/jxstore/cms/order.go b/business/jxstore/cms/order.go index d23b06750..e7068f61f 100644 --- a/business/jxstore/cms/order.go +++ b/business/jxstore/cms/order.go @@ -191,13 +191,13 @@ func GetManageStatisticsJob(ctx *jxcontext.Context, cityCodes []int, fromTime, t func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) { globals.SugarLogger.Debugf("UnionOrderCallBack unionOrder: %v", utils.Format4Output(unionOrder, true)) var ( - jobOrder = &model.JobOrder{} - db = dao.GetDB() + db = dao.GetDB() ) if unionOrder.SID == "" { return err } - jobOrder.ID = utils.Str2Int64(unionOrder.SID) + userID := unionOrder.SID[:32] + jobID := unionOrder.SID[32:] txDB, _ := dao.Begin(db) defer func() { if r := recover(); r != nil { @@ -205,14 +205,11 @@ func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) { panic(r) } }() - if err := dao.GetEntity(db, jobOrder); err != nil { - return err - } - userBill, err := dao.GetUserBill(db, jobOrder.UserID, "") + userBill, err := dao.GetUserBill(db, userID, "") if userBill == nil { return fmt.Errorf("未查询到该用户的账单!") } - if err = financial.AddIncomeUpdateAccount(txDB, userBill, model.BillTypeUnionShare, int(unionOrder.Profit), jobOrder.JobID); err != nil { + if err = financial.AddIncomeUpdateAccount(txDB, userBill, model.BillTypeUnionShare, int(unionOrder.Profit), utils.Str2Int(jobID)); err != nil { dao.Rollback(db, txDB) return err }