diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d284ccbec..4bffc88c7 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -6091,13 +6091,13 @@ func BatchCreateFreeShipTemplate(relInfo map[string][]tiktok_store.RelInfo, ship for k, v := range relInfo { for _, i := range v { if bindFreightID, err := tiktok_store.GetStoreFreight(k, utils.Str2Int64(i.VendorStoreID)); err != nil || bindFreightID == 0 { - if err := tiktok_store.CreateBindFreeShipTemplate(utils.Str2Int(i.StoreID), shipFee); err != nil { + if err := tiktok_store.CreateBindFreeShipTemplate(k, utils.Str2Int(i.StoreID), shipFee); err != nil { errList.AddErr(err) } } else { _ = tiktok_store.ShopBindStoreFreight(k, utils.Str2Int64(i.VendorStoreID), bindFreightID) globals.SugarLogger.Debugf("进入更新包邮模板操作") - if err := tiktok_store.UpdateFreeShipTemplate(utils.Str2Int(i.StoreID), shipFee); err != nil { + if err := tiktok_store.UpdateFreeShipTemplate(k, utils.Str2Int(i.StoreID), shipFee); err != nil { errList.AddErr(err) } } diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 28d530541..3aa538e48 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -558,7 +558,7 @@ func UpdateFreightTemplate(storeCode int) error { } // /freightTemplate/create 批量创建绑定 满x包邮 运费模板 -func CreateBindFreeShipTemplate(storeID int, shipFee int64) error { +func CreateBindFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64) error { var ( db = dao.GetDB() errList = errlist.New() @@ -594,10 +594,10 @@ func CreateBindFreeShipTemplate(storeID int, shipFee int64) error { param.Template.ProductCity = int64(storeDetail.CityCode) } globals.SugarLogger.Debugf("CreateBindFreeShipTemplate param====%s", utils.Format4Output(param, false)) - if resp, err := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID).FreightTemplateCreate(param); err != nil { + if resp, err := getAPI(vendorOrgCode, 0, "").FreightTemplateCreate(param); err != nil { return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 创建包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err)) } else { - if err := ShopBindStoreFreight(storeDetail.VendorOrgCode, utils.Str2Int64(storeDetail.VendorStoreID), resp.TemplateId); err != nil { + if err := ShopBindStoreFreight(vendorOrgCode, utils.Str2Int64(storeDetail.VendorStoreID), resp.TemplateId); err != nil { return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 绑定包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err)) } else { if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil { @@ -616,7 +616,7 @@ func CreateBindFreeShipTemplate(storeID int, shipFee int64) error { } //更新 包邮运费模板 -func UpdateFreeShipTemplate(storeID int, shipFee int64) error { +func UpdateFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64) error { if shipFee == 0 { return errors.New("包邮金额必传,请检查") } @@ -624,7 +624,7 @@ func UpdateFreeShipTemplate(storeID int, shipFee int64) error { if err != nil { return errors.New("更新包邮运费模板,获取门店信息失败,请重试") } - a := getAPI(storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID) + a := getAPI(vendorOrgCode, storeID, storeDetail.VendorStoreID) //获取远程运费模板详情 if bindFreightID, err := a.GetStoreFreight(utils.Str2Int64(storeDetail.VendorStoreID)); err != nil || len(bindFreightID) == 0 || utils.IsNil(bindFreightID) { //return errors.New("门店未绑定运费模板,")