1

business/jxstore/cms/sku.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"io"
 	"math"
 	"mime/multipart"
@@ -3069,8 +3069,15 @@ func UpdateVendorImg(ctx *jxcontext.Context, i, storeId int, imgWaterMark string
 				if err != nil {
 					return nil, err
 				}
-				api := mtwm.GetAPI(storeDetail.VendorOrgCode, storeId, storeDetail.VendorStoreID)
-				//for {
+				var api *mtwmapi.API //= mtwm.GetAPI(fromStore.VendorOrgCode, fromStore.ID, fromStore.VendorStoreID)
+				if storeDetail.VendorOrgCode == globals.Mtwm2Code {
+					api = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "")
+					api.SetToken(storeDetail.MtwmToken)
+				} else {
+					api = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, storeDetail.VendorOrgCode).(*mtwmapi.API)
+				}
+
+				for {
 					foodList, _ := api.RetailListAll(storeDetail.VendorStoreID, i)
 					for _, v := range foodList {
 						skuEx := &model.SkuExinfoMap{
@@ -3109,14 +3116,13 @@ func UpdateVendorImg(ctx *jxcontext.Context, i, storeId int, imgWaterMark string
 						imgList = append(imgList, qiNiuImg, ImgMix)
 						time.Sleep(100 * time.Microsecond)
 					}
-				//	globals.SugarLogger.Debugf("----i := %d,len := %d", i, len(foodList))
-				//	if len(foodList) < 100 {
-				//		break
-				//	}
-				//	i++
-				//}
+					globals.SugarLogger.Debugf("----i := %d,len := %d", i, len(foodList))
+					if len(foodList) < 100 {
+						break
+					}
+					i++
+				}
 
-				time.Sleep(1 * time.Second)
 				for _, v := range imgList {
 					jxutils.DeleteExportContent(strings.Split(v, "/")[3])
 					time.Sleep(100 * time.Microsecond)