liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
richboo111
2023-03-07 15:34:58 +08:00
parent 2f9b099552
commit 8497dee24e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/store.go
View File

@@ -6091,13 +6091,13 @@ func BatchCreateFreeShipTemplate(relInfo map[string][]tiktok_store.RelInfo, ship
for k, v := range relInfo { for k, v := range relInfo {
for _, i := range v { for _, i := range v {
if bindFreightID, err := tiktok_store.GetStoreFreight(k, utils.Str2Int64(i.VendorStoreID)); err != nil || bindFreightID == 0 { 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) errList.AddErr(err)
} }
} else { } else {
_ = tiktok_store.ShopBindStoreFreight(k, utils.Str2Int64(i.VendorStoreID), bindFreightID) _ = tiktok_store.ShopBindStoreFreight(k, utils.Str2Int64(i.VendorStoreID), bindFreightID)
globals.SugarLogger.Debugf("进入更新包邮模板操作") 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) errList.AddErr(err)
} }
} }

10
business/partner/purchase/tiktok_store/store.go
View File

@@ -558,7 +558,7 @@ func UpdateFreightTemplate(storeCode int) error {
} }
// /freightTemplate/create 批量创建绑定 满x包邮 运费模板 // /freightTemplate/create 批量创建绑定 满x包邮 运费模板
func CreateBindFreeShipTemplate(storeID int, shipFee int64) error { func CreateBindFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64) error {
var ( var (
db = dao.GetDB() db = dao.GetDB()
errList = errlist.New() errList = errlist.New()
@@ -594,10 +594,10 @@ func CreateBindFreeShipTemplate(storeID int, shipFee int64) error {
param.Template.ProductCity = int64(storeDetail.CityCode) param.Template.ProductCity = int64(storeDetail.CityCode)
} }
globals.SugarLogger.Debugf("CreateBindFreeShipTemplate param====%s", utils.Format4Output(param, false)) 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)) return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 创建包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err))
} else { } 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)) return errors.New(fmt.Sprintf("平台门店(%s) 京西门店(%d) 绑定包邮模板失败:%v,根据提示处理", storeDetail.VendorStoreID, storeID, err))
} else { } else {
if err := dao.CreateEntity(db, FreightTemplate); dao.IsDuplicateError(err) || err != nil { 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 { if shipFee == 0 {
return errors.New("包邮金额必传,请检查") return errors.New("包邮金额必传,请检查")
} }
@@ -624,7 +624,7 @@ func UpdateFreeShipTemplate(storeID int, shipFee int64) error {
if err != nil { if err != nil {
return errors.New("更新包邮运费模板,获取门店信息失败,请重试") 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) { if bindFreightID, err := a.GetStoreFreight(utils.Str2Int64(storeDetail.VendorStoreID)); err != nil || len(bindFreightID) == 0 || utils.IsNil(bindFreightID) {
//return errors.New("门店未绑定运费模板，") //return errors.New("门店未绑定运费模板，")