Merge branch 'alibaba'

upstream/alibaba/ali_goods.go

@@ -13,19 +13,19 @@ type goodsAli struct {
 var Goods = goodsAli{}
 
 type GoodsListReq struct {
-	RuleId     string `json:"ruleId,omitempty"`         //选品规划id
-	CategoryId string `json:"postCategoryId,omitempty"` //分类ID
-	KeyWords   string `json:"keyWords,omitempty"`       //搜索关键词
-	PageNo     int    `json:"pageNo"`                   //页码
-	PageSize   int    `json:"pageSize"`                 //页面数量;最大20
-	TopOfferIds string `json:"topOfferIds,omitempty"` //商品置顶，只会在第一页置顶，和分页大小相同最多50个
+	RuleId      string `json:"ruleId,omitempty"`         //选品规划id
+	CategoryId  string `json:"postCategoryId,omitempty"` //分类ID
+	KeyWords    string `json:"keyWords,omitempty"`       //搜索关键词
+	PageNo      int    `json:"pageNo"`                   //页码
+	PageSize    int    `json:"pageSize"`                 //页面数量;最大20
+	TopOfferIds string `json:"topOfferIds,omitempty"`    //商品置顶，只会在第一页置顶，和分页大小相同最多50个
 	AccessToken string `json:"access_token"`
 }
 
 type GoodsListRes struct {
 	Result struct {
 		CommonRes
-		Result  struct {
+		Result struct {
 			PageIndex    int `json:"pageIndex"`
 			TotalRecords int `json:"totalRecords"`
 			SizePerPage  int `json:"sizePerPage"`
@@ -45,7 +45,6 @@ type GoodsListRes struct {
 	} `json:"result"`
 }
 
-
 type GoodsInfoRes struct {
 	CommonRes
 	BizGroupInfos []struct {
@@ -55,8 +54,8 @@ type GoodsInfoRes struct {
 	} `json:"bizGroupInfos"`
 	ProductInfo struct {
 		ProductID       int64           `json:"productID"`
-		SupplierLoginId string          `json:"SupplierLoginId"`
-		MainVedio       string          `json:"MainVedio"`
+		SupplierLoginId string          `json:"supplierLoginId"`
+		MainVedio       string          `json:"mainVedio"`
 		CategoryID      int             `json:"categoryID"`
 		Subject         string          `json:"subject"`
 		Description     string          `json:"description"`
@@ -170,18 +169,25 @@ type GoodsFollowRes struct {
 	ErrorMessage int         `json:"errorMessage"`
 }
 
+type RelationRes struct {
+	Success      bool        `json:"success"`
+	Data         interface{} `json:"data"`
+	ErrorCode    int         `json:"errorCode"`
+	ErrorMessage int         `json:"errorMessage"`
+}
 
 type OutshopAddRes struct {
 	Code    int `json:"code"`
 	Message int `json:"message"`
 }
 
-type RelationAddReq struct {
+
+type RelationInfoReq struct {
 	Channel     string `json:"channel"`     // 下游渠道代码
 	OutShopCode string `json:"outShopCode"` //  下游店铺code
 	OfferId     string `json:"offerId"`     //上游1688商品id
-	OutItemCode string `json:"outItemCode"` //下游外部商品码
-	AccessToken string `json:"access_token"`
+	OutItemCode  string `json:"outItemCode"` //下游外部商品码
+	AccessToken  string `json:"access_token"`
 }
 
 type GoodsCategoryReq struct {
@@ -258,7 +264,6 @@ func (goodsAli) UnFollow(ctx context.Context, GoodsID string) (res *GoodsFollowR
 	return
 }
 
-
 func (goodsAli) Category(ctx context.Context, CategoryID interface{}) (res *GoodsCategoryRes, err error) {
 	method := "com.alibaba.product/alibaba.category.get"
 	var req = &GoodsCategoryReq{
@@ -285,8 +290,8 @@ func (goodsAli) OutshopAdd(ctx context.Context, merId string) (res *GoodsFollowR
 	return
 }
 
-//OutshopAdd 添加分销商品关系
-func (goodsAli) RelationAdd(ctx context.Context, req *RelationAddReq) (res *OutshopAddRes, err error) {
+//RelationAdd 添加分销商品关系
+func (goodsAli) RelationAdd(ctx context.Context, req *RelationInfoReq) (res *RelationRes, err error) {
 	method := "com.alibaba.fenxiao/alibaba.fenxiao.buyer.outproduct.relation.add"
 
 	req.AccessToken = server.AccessToken
@@ -296,3 +301,25 @@ func (goodsAli) RelationAdd(ctx context.Context, req *RelationAddReq) (res *Outs
 
 	return
 }
+
+//RelationGet 查询分销商品关系
+func (goodsAli) RelationGet(ctx context.Context, req *RelationInfoReq) (res *RelationRes, err error) {
+	method := "com.alibaba.fenxiao/alibaba.fenxiao.buyer.outproduct.relation.get"
+
+	req.AccessToken = server.AccessToken
+	req.Channel = "other"
+	result, err := server.Post(ctx, method, gconv.Map(req))
+	_ = gjson.New(result).Scan(&res)
+	return
+}
+
+//RelationDel 删除分销商品关系
+func (goodsAli) RelationDel(ctx context.Context, req *RelationInfoReq) (res *RelationRes, err error) {
+	method := "com.alibaba.fenxiao/alibaba.fenxiao.buyer.outproduct.relation.delete"
+
+	req.AccessToken = server.AccessToken
+	req.Channel = "other"
+	result, err := server.Post(ctx, method, gconv.Map(req))
+	_ = gjson.New(result).Scan(&res)
+	return
+}

upstream/alibaba/ali_order.go

@@ -30,9 +30,12 @@ type OrderAddress struct {
 }
 
 type OrderCargo struct {
-	SpecId   string `json:"specId"`
-	OfferId  int64  `json:"offerId"`
-	Quantity int    `json:"quantity"`
+	SpecId      string `json:"specId"`
+	OfferId     int64  `json:"offerId"`
+	Quantity    int    `json:"quantity"`
+	OutShopCode string `json:"outShopCode"`
+	OutItemCode string `json:"outItemCode"`
+	Channel     string `json:"channel"`
 }
 
 type OuterOrderInfo struct {
@@ -66,9 +69,9 @@ func (s *orderAli) Create(ctx context.Context, req *OrderCommonReq) (res *OrderC
 		"addressParam":   gjson.New(req.AddressParam).MustToJsonString(),
 		"cargoParamList": gjson.New(req.CargoParam).MustToJsonString(),
 		"outerOrderInfo": gjson.New(req.OuterOrderInfo).MustToJsonString(),
-		"flow":"fenxiao",
-		"isvBizTypePD":"false",
-		"isvBizTypeStr":"fenxiaoMedia",
+		"flow":           "fenxiao",
+		"isvBizTypePD":   "false",
+		"isvBizTypeStr":  "fenxiaoMedia",
 	})
 	_ = gjson.New(result).Scan(&res)
 	return
@@ -242,14 +245,14 @@ type OrderBeforeRes struct {
 }
 
 type OrderBeforeItem struct {
-	SumPayment           int64      `json:"sumPayment"`           //订单总费用, 单位为分
-	SumPaymentNoCarriage int64      `json:"sumPaymentNoCarriage"` //不包含运费的货品总费用, 单位为分.
-	AdditionalFee        int64      `json:"additionalFee"`        //附加费,单位，分
-	SumCarriage          int64      `json:"sumCarriage"`          //总运费信息, 单位为分.
-	ResultCode           string     `json:"resultCode"`           //
+	SumPayment           int64  `json:"sumPayment"`           //订单总费用, 单位为分
+	SumPaymentNoCarriage int64  `json:"sumPaymentNoCarriage"` //不包含运费的货品总费用, 单位为分.
+	AdditionalFee        int64  `json:"additionalFee"`        //附加费,单位，分
+	SumCarriage          int64  `json:"sumCarriage"`          //总运费信息, 单位为分.
+	ResultCode           string `json:"resultCode"`           //
 	ShopPromotionList    []struct { //可用店铺级别优惠列表
 		PromotionId int64 `json:"promotionId"` //优惠券ID
-	} `json:"shopPromotionList"` //规格信息
+	} `json:"shopPromotionList"`      //规格信息
 	Message   string `json:"message"` //返回信息
 	CargoList []struct {
 		FinalUnitPrice float64 `json:"finalUnitPrice"` //最终单价
@@ -267,7 +270,7 @@ func (s *orderAli) Before(ctx context.Context, req *OrderCommonReq) (res *OrderB
 		"access_token":   server.AccessToken,
 		"addressParam":   gjson.New(req.AddressParam).MustToJsonString(),
 		"cargoParamList": gjson.New(req.CargoParam).MustToJsonString(),
-		"flow" : "saleproxy",
+		"flow":           "saleproxy",
 	})
 	_ = gjson.New(result).Scan(&res)
 	return