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:
suyl
2021-04-29 15:32:40 +08:00
parent 5697f49bf1
commit c4dd7832f8
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1983,9 +1983,10 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resource
return "", err return "", err
} }
vendorID := job.VendorID vendorID := job.VendorID
unionID := mobile + utils.Int2Str(jobID)
handler := partner.GetHandler(vendorID) handler := partner.GetHandler(vendorID)
//1、建推广位（本地和平台） //1、建推广位（本地和平台）
if userBinds, err = dao.GetUserUnionBind(db, userID, vendorID); err != nil { if userBinds, err = dao.GetUserUnionBind(db, userID, vendorID, unionID); err != nil {
return "", err return "", err
} }
//本地已有推广位 //本地已有推广位
@@ -1998,9 +1999,9 @@ func ShareUnionLink(ctx *jxcontext.Context, jobID, shareType, linkType, resource
} }
dao.WrapAddIDCULDEntity(userBind, ctx.GetUserName()) dao.WrapAddIDCULDEntity(userBind, ctx.GetUserName())
if handler != nil { if handler != nil {
if sid, err = handler.CreateUnionPosition(ctx, mobile+utils.Int2Str(jobID)); err == nil { if sid, err = handler.CreateUnionPosition(ctx, unionID); err == nil {
if sid == "" { if sid == "" {
sid = mobile + utils.Int2Str(jobID) sid = unionID
if vendorID == model.VendorIDTB { if vendorID == model.VendorIDTB {
sid = utils.Int2Str(tbunionapi.JxAdzoneID) sid = utils.Int2Str(tbunionapi.JxAdzoneID)
} }

6
business/model/dao/dao_user.go
View File

@@ -394,7 +394,7 @@ func GetUserAllWaitRealCashPrice(db *DaoDB, userID string) (price int, err error
err = GetRow(db, &result, sql, sqlParams) err = GetRow(db, &result, sql, sqlParams)
return result.Price, err return result.Price, err
} }
func GetUserUnionBind(db *DaoDB, userID string, vendorID int) (userBinds []*model.UserUnionBind, err error) { func GetUserUnionBind(db *DaoDB, userID string, vendorID int, unionID string) (userBinds []*model.UserUnionBind, err error) {
sql := ` sql := `
SELECT * FROM user_union_bind WHERE deleted_at = ? SELECT * FROM user_union_bind WHERE deleted_at = ?
` `
@@ -409,6 +409,10 @@ func GetUserUnionBind(db *DaoDB, userID string, vendorID int) (userBinds []*mode
sql += " AND vendor_id = ?" sql += " AND vendor_id = ?"
sqlParams = append(sqlParams, vendorID) sqlParams = append(sqlParams, vendorID)
} }
if unionID != "" {
sql += " AND union_id = ?"
sqlParams = append(sqlParams, unionID)
}
err = GetRows(db, &userBinds, sql, sqlParams) err = GetRows(db, &userBinds, sql, sqlParams)
return userBinds, err return userBinds, err
} }

2
business/model/user.go
View File

@@ -287,6 +287,6 @@ type UserUnionBind struct {
func (v *UserUnionBind) TableUnique() [][]string { func (v *UserUnionBind) TableUnique() [][]string {
return [][]string{ return [][]string{
[]string{"UserID", "VendorID"}, []string{"UserID", "VendorID", "UnionID"},
} }
} }