Merge branch 'supplier'

# Conflicts:
#	supplier/yz/base.go

supplier/yz/base.go

@@ -24,8 +24,9 @@ type Config struct {
 }
 
 type CommonRes struct {
+
 	Success       bool   `json:"success"`
-	Code    string `json:"code"`
+	Code    int `json:"code"`
 	Message string `json:"message"`
 	TraceId string `json:"trace_id"`
 }
@@ -86,17 +87,20 @@ func (s *client) postImg(ctx context.Context, method string, params string) (str
 		return
 	}
 
+
 	fileWrite, err := bodyWrite.CreateFormFile("image", params)
 	_, err = io.Copy(fileWrite, file)
 
 	if err != nil {
 		return
+
 	}
 	bodyWrite.Close() //要关闭，会将w.w.boundary刷写到w.writer中
 	// 创建请求
 	contentType := bodyWrite.FormDataContentType()
 	req, err := http.NewRequest(http.MethodPost, url, bodyBuf)
 	if err != nil {
+
 		return
 	}
 	// 设置头
@@ -105,11 +109,16 @@ func (s *client) postImg(ctx context.Context, method string, params string) (str
 	if err != nil {
 		return
 	}
+	if resp==nil{
+		return
+	}
+
 	defer func() {
 		_ = resp.Body.Close()
 		paramStr := gjson.New(params).MustToJsonString()
 		ctx = context.WithValue(ctx, "Method", "POST")
 		ctx = context.WithValue(ctx, "URI", url)
+		_ = os.Remove(params)
 		if err != nil {
 			g.Log().Ctx(ctx).Cat(pkgName).Cat("error").Infof("参数【%v】错误【%v】响应时间【%v ms】", paramStr, err.Error(), gtime.TimestampMilli()-Start)
 		} else {

supplier/yz/goods.go

@@ -4,15 +4,43 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/gogf/gf/encoding/gjson"
-	"github.com/gogf/gf/util/gconv"
 	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/util/gconv"
 )
 
 type goodsJD struct {
 }
 
 var Goods = goodsJD{}
-
+type UpdateGoodsReq struct {
+	Param  UpdateGoodsParam `json:"param"`
+}
+type UpdateGoodsParam struct {
+	ItemId   int `json:"item_id"`
+	//NodeKdtId         int `json:"node_kdt_id"`
+	ItemDeliveryParam  ItemDeliveryParam `json:"item_delivery_param"`
+	ItemWeight int `json:"item_weight"`
+	ItemNo     string `json:"item_no"`
+	SkuList    []SkuListUpdate `json:"sku_list"`
+	Desc          string `json:"desc"`
+	ImageIds      []int64  `json:"image_ids"`
+	SkuValueProps  []SkuValueProps `json:"sku_value_props"`
+	ItemType       int `json:"item_type"`
+	ItemPriceParam  ItemPriceParam `json:"item_price_param"`
+	Title     string `json:"title"`
+	IsDisplay int    `json:"is_display"`
+	Quantity  int    `json:"quantity"`
+	HideStock int    `json:"hide_stock"`
+}
+type SkuListUpdate struct {
+	//SkuProps  []SkuProps  `json:"sku_props"`
+	Price         int    `json:"price"`
+	MaxGuidePrice int    `json:"max_guide_price"`
+	CostPrice     int    `json:"cost_price"`
+	SkuNo         string    `json:"sku_no"`
+	StockNum      int    `json:"stock_num"`
+	SkuId		int64 `json:"sku_id"`
+}
 type AddGoodsReq struct {
 	Param  AddGoodsParam `json:"param"`
 }
@@ -21,14 +49,14 @@ type ItemDeliveryParam struct {
 	DeliverySetting DeliverySetting  `json:"delivery_setting"`
 }
 type DeliverySetting struct {
-Express bool `json:"express"`
+	Express bool `json:"express"`
 }
 type SkuList struct {
 	SkuProps  []SkuProps  `json:"sku_props"`
 	Price         int    `json:"price"`
 	MaxGuidePrice int    `json:"max_guide_price"`
 	CostPrice     int    `json:"cost_price"`
-	SkuNo         int    `json:"sku_no"`
+	SkuNo         string    `json:"sku_no"`
 	StockNum      int    `json:"stock_num"`
 }
 type SkuProps struct {
@@ -44,16 +72,16 @@ type SkuValueProps struct {
 	Id    int    `json:"id"`
 }
 type ItemPriceParam struct {
-	Origin    int `json:"origin"`
+	Origin    string `json:"origin"`
 	CostPrice int `json:"cost_price"`
 	Price     int `json:"price"`
 }
 type AddGoodsParam struct {
 	ItemId   int `json:"item_id"`
-	NodeKdtId         int `json:"node_kdt_id"`
+	//NodeKdtId         int `json:"node_kdt_id"`
 	ItemDeliveryParam  ItemDeliveryParam `json:"item_delivery_param"`
 	ItemWeight int `json:"item_weight"`
-	ItemNo     int `json:"item_no"`
+	ItemNo     string `json:"item_no"`
 	SkuList    []SkuList `json:"sku_list"`
 	Desc          string `json:"desc"`
 	ImageIds      []int64  `json:"image_ids"`
@@ -76,6 +104,21 @@ type UplpadImgReq struct {
 	Image string `json:"image"`
 
 }
+type FindGoodsDataReq struct {
+	ItemId int    `json:"item_id"`
+}
+type FindGoodsDataRes struct {
+	CommonRes
+	Data GoodsData `json:"data"`
+
+}
+type GoodsData struct {
+	SkuList []SkuListData `json:"sku_list"`
+}
+type SkuListData struct {
+	SkuId int64 `json:"sku_id"`
+	SkuNo string `json:"sku_no"`
+}
 // type UplpadImgRes struct {
 // 	CommonRes
 // 	Data struct {
@@ -85,8 +128,7 @@ type UplpadImgReq struct {
 // }
 
 type UplpadImgRes struct {
-	TraceId string `json:"trace_id"`
-	Code    int    `json:"code"`
+	CommonRes
 	Data    struct {
 		KdtId    int    `json:"kdt_id"`
 		ImageUrl string `json:"image_url"`
@@ -94,14 +136,12 @@ type UplpadImgRes struct {
 		ImageId  int64  `json:"image_id"`
 		Height   int    `json:"height"`
 	} `json:"data"`
-	Success bool   `json:"success"`
-	Message string `json:"message"`
 }
 // 添加商品
 func (*goodsJD) AddGoods(ctx context.Context, req *AddGoodsReq) (res *AddGoodsRes, err error) {
 
-	// g.Dump(11111111,req)
-	// return
+	g.Dump(11111111,req)
+	return
 	method := "youzan.item.add/1.0.1"
 	param := gconv.Map(req)
 
@@ -114,7 +154,8 @@ func (*goodsJD) AddGoods(ctx context.Context, req *AddGoodsReq) (res *AddGoodsRe
 }
 
 // 编辑商品
-func (*goodsJD) UpdateGoods(ctx context.Context, req *AddGoodsReq) (res *AddGoodsRes, err error) {
+func (*goodsJD) UpdateGoods(ctx context.Context, req *UpdateGoodsReq) (res *AddGoodsRes, err error) {
+
 	method := "youzan.item.incremental.update/1.0.1"
 	param := gconv.Map(req)
 	result, err := server.requestApi(ctx, method, param)
@@ -134,14 +175,22 @@ func (*goodsJD) UploadImg(ctx context.Context, req *UplpadImgReq) (res *UplpadIm
 	//}
 	result, err := server.requestApiImg(ctx, method, req.Image)
 	if err != nil {
-		g.Dump("111111123",err)
 		return
 	}
 	err = json.Unmarshal([]byte(result), &res)
-	g.Dump("11111112344444",err)
 	return
 }
-
+// 商品详情
+func (*goodsJD) FindGoodsData(ctx context.Context, req *FindGoodsDataReq) (res *FindGoodsDataRes, err error) {
+	method := "youzan.item.detail.get/1.0.0"
+	param := gconv.Map(req)
+	result, err := server.requestApi(ctx, method, param)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal([]byte(result), &res)
+	return
+}
 //type UpDateStockReq struct {
 //	Quantity string `json:"quantity"`
 //	ItemId   string `json:"item_id"`