Merge branch 'master' of https://e.coding.net/rosydev/baseapi

platformapi/tao_vegetable/order_afs.go

@@ -158,6 +158,7 @@ func (a *API) QueryAfsOrderDetail(req *request591.AlibabaWdkOrderRefundGetReques
 		return nil, fmt.Errorf(*data.Result.ReturnMsg)
 	}
 
+	globals.SugarLogger.Debugf("QueryAfsOrderDetail := %s", utils.Format4Output(data, false))
 	return &data.Result, nil
 }
 

platformapi/tao_vegetable/order_test.go

@@ -19,7 +19,7 @@ func TestName(t *testing.T) {
 func TestGetOrderDetail(t *testing.T) {
 	requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
 		StoreId:    utils.String2Pointer("JX668594"),
-		BizOrderId: utils.Int64ToPointer(5000897680290460922),
+		BizOrderId: utils.Int64ToPointer(5000897982558990922),
 	}}
 	data, err := apiTao.QueryOrderDetail(requestParam)
 	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
@@ -40,11 +40,10 @@ func TestPartialRefundReason(t *testing.T) {
 
 func TestQueryAfsOrderDetail(t *testing.T) {
 	param := &request591.AlibabaWdkOrderRefundGetRequest{
-		BizOrderIds: &[]int64{1924482145266804887},
+		OrderFrom: utils.Int64ToPointer(31),
-		RefundIds:   &[]int64{1000010803420790044},
+		ShopId:    nil,
-		OrderFrom:   utils.Int64ToPointer(31),
+		StoreId:   utils.String2Pointer("JX668594"),
-		ShopId:      nil,
+		RefundIds: &[]int64{1311956159},
-		StoreId:     utils.String2Pointer("JX668594"),
 	}
 	data, err := apiTao.QueryAfsOrderDetail(param)
 	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))

platformapi/tao_vegetable/store_categary.go

@@ -61,7 +61,7 @@ func (a *API) GetStoreCategoryInfo(code string) (*CategoryInfo, error) {
 
 // AddStoreCategoryInfo 添加门店分类
 func (a *API) AddStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryAddRequest) (string, error) {
-	globals.SugarLogger.Debugf("进入 AddStoreCategoryInfo")
+	globals.SugarLogger.Debugf("进入 AddStoreCategoryInfo := %s", utils.Format4Output(param, false))
 	storeCategory := ability587.NewAbility587(&a.client)
 	resp, err := storeCategory.AlibabaWdkSkuCategoryAdd(param, a.token)
 	globals.SugarLogger.Debugf("进入 AddStoreCategoryInfo : %s,%v", utils.Format4Output(resp, false), err)

platformapi/tao_vegetable/store_sku.go

@@ -16,7 +16,7 @@ import (
 
 // AddStoreSku 新增门店商品
 func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableResultList, error) {
-	globals.SugarLogger.Debugf("进入 AddStoreSku")
+	globals.SugarLogger.Debugf("进入 AddStoreSku : %s", utils.Format4Output(param, false))
 	client := ability585.NewAbility585(&a.client)
 
 	data, _ := client.AlibabaWdkSkuAdd(param, a.token)
@@ -54,7 +54,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR
 
 // UpdateStoreSku 更新门店商品
 func (a *API) UpdateStoreSku(param *request.AlibabaWdkSkuUpdateRequest) (*[]VegetableResultList, error) {
-	globals.SugarLogger.Debugf("进入 UpdateStoreSku")
+	globals.SugarLogger.Debugf("进入 UpdateStoreSku: %s", utils.Format4Output(param, false))
 	client := ability585.NewAbility585(&a.client)
 
 	data, _ := client.AlibabaWdkSkuUpdate(param, a.token)
@@ -120,7 +120,7 @@ func (a *API) StoreSkuStock(param *request589.AlibabaWdkStockPublishRequest) err
 	client := ability589.NewAbility589(&a.client)
 
 	data, _ := client.AlibabaWdkStockPublish(param)
-
+	globals.SugarLogger.Debugf("StoreSkuStock err := %s", utils.Format4Output(data, false))
 	if !data.IsSuccess {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(data.Message)

platformapi/tao_vegetable/store_sku_test.go

@@ -20,22 +20,7 @@ import (
 
 // 上传图片
 func TestUploadImg(t *testing.T) {
-	responseImg, err := http.Get("http://image.jxc4.com/8b7e117eb51bda162ea7fd249086d2e0.png")
+	uploadImg(apiTao, []string{"http://image.jxc4.com/9e8e8471ba959d10166d0cf4f08ccb2d.jpg"})
-	if err != nil {
-		globals.SugarLogger.Debugf("img err := %s", err.Error())
-		return
-	}
-
-	imgByte, _ := ioutil.ReadAll(responseImg.Body)
-	globals.SugarLogger.Debugf("=======imgByte := %s", utils.Format4Output(len(imgByte), false))
-	data, err := apiTao.UploadImg(&request1475.AlibabaWdkPictureUploadRequest{
-		PictureCategoryId: utils.Int64ToPointer(0),
-		Img:               &imgByte,
-		ImgInputTitle:     utils.String2Pointer("059c91725ee08443a4aaa204d1f54032.png"),
-		Title:             utils.String2Pointer("059c91725ee08443a4aaa204d1f54032"),
-	})
-	globals.SugarLogger.Debugf("=======data := %s", utils.Format4Output(data, false))
-	globals.SugarLogger.Debugf("=======err2 := %s", utils.Format4Output(err, false))
 }
 
 func TestAddStoreSku(t *testing.T) {
@@ -190,7 +175,6 @@ func TestGetSkuDetaul(t *testing.T) {
 	globals.SugarLogger.Debugf("err  :=  %s ", utils.Format4Output(err, false))
 	globals.SugarLogger.Debugf("result  :=  %s ", utils.Format4Output(result, false))
 }
-
 func uploadImg(api *API, imgs []string) *string {
 	result := make([]string, 0, 0)
 	for _, v := range imgs {
@@ -217,3 +201,22 @@ func uploadImg(api *API, imgs []string) *string {
 
 	return utils.String2Pointer(strings.Join(result, ","))
 }
+
+func TestUpLoadImg(t *testing.T) {
+	v := `http://image.jxc4.com/9e8e8471ba959d10166d0cf4f08ccb2d.jpg`
+	inputTitle := strings.LastIndex(v, "/")
+	title := strings.LastIndex(v, ".")
+	resp, err := http.Get(v)
+	globals.SugarLogger.Debugf("err :=    get err := %s", utils.Format4Output(err, false))
+	body, err := ioutil.ReadAll(resp.Body)
+	globals.SugarLogger.Debugf("err :=2    get err := %s", utils.Format4Output(err, false))
+
+	dataa, err3 := apiTao.UploadImg(&request1475.AlibabaWdkPictureUploadRequest{
+		PictureCategoryId: utils.Int64ToPointer(0),
+		Img:               &body,
+		ImgInputTitle:     utils.String2Pointer(v[inputTitle:]),
+		Title:             utils.String2Pointer(v[inputTitle:title]),
+	})
+	globals.SugarLogger.Debugf("errr3 := %s", utils.Format4Output(err3, false))
+	globals.SugarLogger.Debugf("data2 := %s", utils.Format4Output(dataa, false))
+}

platformapi/tao_vegetable/upload_img.go

@@ -13,6 +13,8 @@ func (a *API) UploadImg(param *request.AlibabaWdkPictureUploadRequest) (string,
 	client := ability1475.NewAbility1475(&a.client)
 
 	data, err := client.AlibabaWdkPictureUpload(param, a.token)
+	globals.SugarLogger.Debugf("===UploadImg data ======== : %s", utils.Format4Output(data, false))
+	globals.SugarLogger.Debugf("===UploadImg data ======== : %s", utils.Format4Output(err, false))
 	if err != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
 		return "", err
@@ -23,5 +25,7 @@ func (a *API) UploadImg(param *request.AlibabaWdkPictureUploadRequest) (string,
 		return "", fmt.Errorf(*data.Result.ErrMsg)
 	}
 
+	globals.SugarLogger.Debugf("UploadImg Data := %s", utils.Format4Output(data, false))
+
 	return *data.Result.Model.FullUrl, nil
 }