From d1438e11bf1cd8ae7aef95ec58ba79b115a6837b Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 10 May 2021 16:36:13 +0800
Subject: [PATCH] aa

---
 business/jxstore/partner/partner.go      |  9 ++-
 business/jxstore/partner/taobao/union.go | 73 ++++++++++++++++++++++--
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/partner/partner.go b/business/jxstore/partner/partner.go
index 4ebbb759c..2935dc80c 100644
--- a/business/jxstore/partner/partner.go
+++ b/business/jxstore/partner/partner.go
@@ -61,9 +61,12 @@ type GoodsDetail2 struct {
 	Imgs      string `json:"imgs"`
 	StoreImg  string `json:"storeImg"`  //店铺图片
 	StoreName string `json:"storeName"` //店铺名
-	Tpwd      string `json:"tpwd"`      //淘口令
-	UrlL      string `json:"urlL"`      //推广地址长链
-	UrlS      string `json:"urlS"`      //推广地址短链
+	Tpwd      string `json:"tpwd"`      //淘口令 非苹果ios14以上版本的设备（即其他ios版本、Android系统等），可以用此淘口令正常在复制到手淘打开
+	//针对苹果ios14及以上版本的苹果设备，手淘将按照示例值信息格式读取淘口令(需包含：数字+羊角符+url，
+	//识别规则可能根据ios情况变更)。如需更改淘口令内文案、url等内容，请务必先验证更改后的淘口令在手淘可被识别打开！
+	TpwdIOS14 string `json:"tpwdIOS14"`
+	UrlL      string `json:"urlL"` //推广地址长链
+	UrlS      string `json:"urlS"` //推广地址短链
 }
 
 type GoodsList struct {
diff --git a/business/jxstore/partner/taobao/union.go b/business/jxstore/partner/taobao/union.go
index b94fe5419..dc1ee5015 100644
--- a/business/jxstore/partner/taobao/union.go
+++ b/business/jxstore/partner/taobao/union.go
@@ -95,24 +95,87 @@ func (s *UnionHandler) GetUnionMatterList(ctx *jxcontext.Context, vendorCatID, k
 				good.GoodsDetail.MainImg = v.WhiteImage
 				good.GoodsDetail.StoreName = v.ShopTitle
 				good.GoodsDetail.Imgs = strings.Join(v.SmallImages, ",")
+				good.GoodsDetail.UrlL = v.CouponShareURL
+				if urlS, err2 := api.TbUnionAPI.SpreadGet(v.CouponShareURL); err2 == nil {
+					good.GoodsDetail.UrlS = urlS
+				}
+				if tpwdCreateResult, err3 := api.TbUnionAPI.TpwdCreate(good.GoodsDetail.UrlL); err3 == nil {
+					good.GoodsDetail.Tpwd = tpwdCreateResult.PasswordSimple
+					good.GoodsDetail.TpwdIOS14 = tpwdCreateResult.Model
+				}
 				goodsList = append(goodsList, good)
 			}
 			list.GoodsList = goodsList
 		}
 	} else {
-		if materResults, err := api.TbUnionAPI.OptimusMaterial(utils.Str2Int(vendorCatID), tbunionapi.JxAdzoneID, page, pageSize); err == nil {
-
+		if materResults, err := api.TbUnionAPI.OptimusMaterial(0, utils.Str2Int(vendorCatID), tbunionapi.JxAdzoneID, page, pageSize); err == nil {
+			for _, v := range materResults {
+				good := &partner.GoodsList{
+					GoodsID:              utils.Int64ToStr(v.ItemID),
+					GoodsName:            v.Title,
+					Img:                  v.PictURL,
+					CouponDiscount:       v.CouponAmount,
+					CouponRemainQuantity: v.CouponRemainCount,
+					MinNormalPrice:       utils.Str2Int(v.ReservePrice),
+					SalesCount:           utils.Int2Str(v.Volume),
+					PromotionRate:        utils.Str2Int(v.CommissionRate),
+				}
+				good.GoodsDetail.MainImg = v.WhiteImage
+				good.GoodsDetail.StoreName = v.ShopTitle
+				good.GoodsDetail.Imgs = strings.Join(v.SmallImages, ",")
+				good.GoodsDetail.UrlL = v.CouponShareURL
+				if urlS, err2 := api.TbUnionAPI.SpreadGet(v.CouponShareURL); err2 == nil {
+					good.GoodsDetail.UrlS = urlS
+				}
+				if tpwdCreateResult, err3 := api.TbUnionAPI.TpwdCreate(good.GoodsDetail.UrlL); err3 == nil {
+					good.GoodsDetail.Tpwd = tpwdCreateResult.PasswordSimple
+					good.GoodsDetail.TpwdIOS14 = tpwdCreateResult.Model
+				}
+				goodsList = append(goodsList, good)
+			}
+			list.GoodsList = goodsList
 		}
 	}
-	return nil, err
+	return list, err
 }
 
 func (s *UnionHandler) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID string) (result *partner.GoodsDetail, err error) {
 	return nil, err
 }
 
-func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (result *partner.MatterList, err error) {
-	return nil, err
+func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (list *partner.MatterList, err error) {
+	list = &partner.MatterList{
+		VendorID: model.VendorIDTB,
+	}
+	var goodsList []*partner.GoodsList
+	if materResults, err := api.TbUnionAPI.OptimusMaterial(utils.Str2Int(goodsID), 0, tbunionapi.JxAdzoneID, offset, pageSize); err == nil {
+		for _, v := range materResults {
+			good := &partner.GoodsList{
+				GoodsID:              utils.Int64ToStr(v.ItemID),
+				GoodsName:            v.Title,
+				Img:                  v.PictURL,
+				CouponDiscount:       v.CouponAmount,
+				CouponRemainQuantity: v.CouponRemainCount,
+				MinNormalPrice:       utils.Str2Int(v.ReservePrice),
+				SalesCount:           utils.Int2Str(v.Volume),
+				PromotionRate:        utils.Str2Int(v.CommissionRate),
+			}
+			good.GoodsDetail.MainImg = v.WhiteImage
+			good.GoodsDetail.StoreName = v.ShopTitle
+			good.GoodsDetail.Imgs = strings.Join(v.SmallImages, ",")
+			good.GoodsDetail.UrlL = v.CouponShareURL
+			if urlS, err2 := api.TbUnionAPI.SpreadGet(v.CouponShareURL); err2 == nil {
+				good.GoodsDetail.UrlS = urlS
+			}
+			if tpwdCreateResult, err3 := api.TbUnionAPI.TpwdCreate(good.GoodsDetail.UrlL); err3 == nil {
+				good.GoodsDetail.Tpwd = tpwdCreateResult.PasswordSimple
+				good.GoodsDetail.TpwdIOS14 = tpwdCreateResult.Model
+			}
+			goodsList = append(goodsList, good)
+		}
+		list.GoodsList = goodsList
+	}
+	return list, err
 }
 
 func jxSortType2TbunionSortType(sort int) (tbsort string) {