diff --git a/business/jxstore/cms/system_store_sku.go b/business/jxstore/cms/system_store_sku.go index 30294b32d..39279da78 100644 --- a/business/jxstore/cms/system_store_sku.go +++ b/business/jxstore/cms/system_store_sku.go @@ -24,10 +24,10 @@ const ( ) // CopyOnStoreSkuToOther 将一个美团门店分类和商品复制到另一个门店 -func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromStoreId, toStoreId string, vendorId int, isAsync bool, offSet int, syncType int) ([]error, error) { +func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromStoreId, toStoreId string, vendorId int, isAsync bool, offSet int, syncType int) ([]string, error) { var ( db = dao.GetDB() - copySkuErr = make([]error, 0, 0) + copySkuErr = make([]string, 0, 0) err error ) @@ -65,9 +65,9 @@ func CopyOnStoreSkuToOther(ctx *jxcontext.Context, fromStoreId, toStoreId string //#region 同步商品 // CopyEBaiToEBai 饿了么商品复制到饿了么 -func CopyEBaiToEBai(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isAsync bool, offset int) (hint string, errList []error, err error) { +func CopyEBaiToEBai(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isAsync bool, offset int) (hint string, errList []string, err error) { VendorCategoryIDMap := map[int64]int64{} - var errListData = make([]error, 0, 0) + var errListData = make([]string, 0, 0) api := api.EbaiAPI taskName := fmt.Sprintf("将饿了么平台门店[%s],分类和商品复制到[%s]", fromStore.VendorStoreID, toStore.VendorStoreID) @@ -118,7 +118,9 @@ func CopyEBaiToEBai(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, } errList := BatchInitSkuEBai2EBai(ctx, fromFoodList.List, api, utils.Int2Str(toStore.ID), VendorCategoryIDMap) if errList != nil { - errListData = append(errListData, errList...) + for _, verr := range errList { + errListData = append(errListData, verr.Error()) + } globals.SugarLogger.Debugf("BatchInitData : %s", utils.Format4Output(errList, false)) } i = i + 1 @@ -177,11 +179,11 @@ func BatchInitSkuEBai2EBai(ctx *jxcontext.Context, fromSku []*ebaiapi.SkuInfo, t } // CopyMtToMT 美团商品复制到美团 -func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isAsync bool, offSet int) (hint string, data []error, err error) { +func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isAsync bool, offSet int) (hint string, data []string, err error) { var fromApi *mtwmapi.API var toApi *mtwmapi.API var errList = make([]*mtwmapi.AppFoodResult, 0, 0) - var errData = make([]error, 0, 0) + var errData = make([]string, 0, 0) if fromStore.VendorOrgCode == globals.Mtwm2Code { fromApi = mtwmapi.New(beego.AppConfig.DefaultString("mtwmAppID2", ""), beego.AppConfig.DefaultString("mtwmSecret2", ""), beego.AppConfig.DefaultString("mtwmCallbackURL2", ""), "") @@ -252,6 +254,7 @@ func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isA globals.SugarLogger.Debugf("errListData %d:= %s", i, utils.Format4Output(errDataList, false)) errList = append(errList, errDataList...) } + globals.SugarLogger.Debugf("==========页数[%d],数据长度[%d]", i, len(fromFoodList)) if len(fromFoodList) < 100 { break } @@ -269,8 +272,9 @@ func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isA hint = task.ID } + globals.SugarLogger.Debugf("======errrList := %s", utils.Format4Output(errList, false)) for _, v := range errList { - errData = append(errData, fmt.Errorf("food_id:%s,错误:%s", v.AppFoodCode, v.ErrorMsg)) + errData = append(errData, fmt.Sprintf("food_id:%s,错误:%s", v.AppFoodCode, v.ErrorMsg)) } return hint, errData, err @@ -278,6 +282,7 @@ func CopyMtToMT(ctx *jxcontext.Context, fromStore, toStore *dao.StoreDetail, isA // BatchInitSkuMT2MT 批量创建商品 func BatchInitSkuMT2MT(ctx *jxcontext.Context, fromSku []*mtwmapi.AppFood, toApi *mtwmapi.API, vendorStoreID string, offset int) (errList []*mtwmapi.AppFoodResult, err error) { + errList = make([]*mtwmapi.AppFoodResult, 0, 0) foodDataList := make([]map[string]interface{}, len(fromSku)) for k, storeSku := range fromSku { foodData := make(map[string]interface{})