diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 1716ef11a..1af060974 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1794,9 +1794,10 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } } } - globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) - globals.SugarLogger.Debug("errList============", utils.Format4Output(errList, true)) - return num, errors.New(fmt.Sprintf("errList=%v,err=%v", utils.Format4Output(errList, true), err)) + errList.AddErr(err) + endErr := errList.GetErrListAsOne() + globals.SugarLogger.Info("endErr==============", endErr) + return num, endErr } func DeleteStore(ctx *jxcontext.Context, storeID int) (num int64, err error) { diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index bcfb3a95e..0e4a76503 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -253,9 +253,10 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) (stri _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID") errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) } + endErr := errList.GetErrListAsOne() if utils.IsNil(errList) { globals.SugarLogger.Debug("绑定门店需进行的错误处理:%v", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true)))) - return "门店绑定成功,但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", utils.Format4Output(errList, true))) + return "门店绑定成功,但需要根据提示进行处理", errors.New(fmt.Sprintf("%s", endErr)) } else { globals.SugarLogger.Debug("the last step of") return "门店绑定成功", nil @@ -370,7 +371,8 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin } } } - return errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, true), err)) + endErr := errList.GetErrListAsOne() + return errors.New(fmt.Sprintf("endErr=%s", endErr)) } // UpdateStoreStatus shop/unsuspendStore 门店恢复营业 diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 67af05fdc..83e38e7cc 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -1,7 +1,6 @@ package tiktok_store import ( - "errors" "fmt" warehouse_bindFencesByStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindFencesByStore/request" warehouse_bindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindStore/request" @@ -244,7 +243,6 @@ func GetFence(appOrgCode, outFenceID string) (warehouse_getFences_response.Fence //单独处理运费模板 func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) error { var ( - errStr []string errList = errlist.New() FreightTemplate = &model.FreightTemplate{} db *dao.DaoDB @@ -271,8 +269,6 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err } else { if err := UpdateFreightTemplate(vendorOrgCode, int(storeID)); err != nil { globals.SugarLogger.Debug("更新运费模板失败:", err) - errStr = append(errStr, fmt.Sprintf("%v", err)) - globals.SugarLogger.Debug("检查是否可行errStr=============", errStr) errList.AddErr(fmt.Errorf("更新运费模板失败:%v", err)) } } @@ -286,5 +282,5 @@ func FreightSpecialTreat(vendorOrgCode string, vendorStoreID, storeID int64) err endErr := errList.GetErrListAsOne() globals.SugarLogger.Info("utils.IsNil(errList)==============", utils.IsNil(errList)) globals.SugarLogger.Debugf("errList===============%s\n,endErr========%v", utils.Format4Output(errList, false), endErr) - return errors.New(fmt.Sprintf("endErr============%s", endErr)) + return endErr }