From 0ad4efa6a6e6b356b16a541ea247a8d5f0fe85ef Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Wed, 28 Apr 2021 11:12:32 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go   | 15 ++++++++-------
 business/jxstore/cms/order.go | 11 ++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 22a422560..a44c88aa0 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -1968,11 +1968,12 @@ func GetUnionActList(ctx *jxcontext.Context, vendorID, actType int) (actList []*
 
 func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resourceType int) (link string, err error) {
 	var (
-		job       = &model.Job{}
-		db        = dao.GetDB()
-		sid       string //推广位ID，美团为userID，淘宝饿了么本地化暂时是固定的京西推广位ID，pdd为表中推广位ID
-		userID    = ctx.GetUserID()
-		userBinds []*model.UserUnionBind
+		job = &model.Job{}
+		db  = dao.GetDB()
+		sid string //推广位ID，美团为userID，淘宝饿了么本地化暂时是固定的京西推广位ID，pdd为表中推广位ID
+		//userID    = ctx.GetUserID()
+		mobile, userID = ctx.GetMobileAndUserID()
+		userBinds      []*model.UserUnionBind
 	)
 	job.ID = jobID
 	if err = dao.GetEntity(db, job); err != nil {
@@ -1994,9 +1995,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+utils.Int2Str(jobID)); err == nil {
+			if sid, err = handler.CreateUnionPosition(ctx, mobile+utils.Int2Str(jobID)); err == nil {
 				if sid == "" {
-					sid = userID + utils.Int2Str(jobID)
+					sid = mobile + 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 e7068f61f..16799a9b3 100644
--- a/business/jxstore/cms/order.go
+++ b/business/jxstore/cms/order.go
@@ -196,8 +196,8 @@ func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) {
 	if unionOrder.SID == "" {
 		return err
 	}
-	userID := unionOrder.SID[:32]
-	jobID := unionOrder.SID[32:]
+	mobile := unionOrder.SID[:11]
+	jobID := unionOrder.SID[11:]
 	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
@@ -205,7 +205,12 @@ func UnionOrderCallBack(unionOrder *partner.UnionOrderInfo) (err error) {
 			panic(r)
 		}
 	}()
-	userBill, err := dao.GetUserBill(db, userID, "")
+	user, err := dao.GetUserByID(db, "mobile", mobile)
+	if err != nil {
+		dao.Rollback(db, txDB)
+		return err
+	}
+	userBill, err := dao.GetUserBill(db, user.UserID, "")
 	if userBill == nil {
 		return fmt.Errorf("未查询到该用户的账单！")
 	}