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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-02-23 14:27:12 +08:00
parent 7b18452932 2290f39083
commit 4b40060e1c
8 changed files with 26 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,9 +552,9 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
Children: []freightTemplate_create_request.ChildrenItem_5{
{
Id: int64(storeDetail.DistrictCode),
Children: []freightTemplate_create_request.ChildrenItem{
{Id: 0},
},
//Children: []freightTemplate_create_request.ChildrenItem{
// {Id: 0},
//},
},
},
},
@@ -571,9 +571,9 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
Children: []freightTemplate_create_request.ChildrenItem_5{
{
Id: int64(storeDetail.DistrictCode),
Children: []freightTemplate_create_request.ChildrenItem{
{Id: 0},
},
//Children: []freightTemplate_create_request.ChildrenItem{
// {Id: 0},
//},
},
},
},

2
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -270,7 +270,7 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
//errList.AddErr(fmt.Errorf("获取门店(%d) 绑定运费模板出错:%v", vendorStoreID, err))
}
if bindFreightIDs == 0 { //（1）未查询到绑定信息，不算错误
if freightTemplateID, err := CreateFreightTemplate(int(storeID)); err != nil || freightTemplateID == 0 || utils.IsNil(freightTemplateID) {
if freightTemplateID, err := CreateFreightTemplate(int(storeID)); err != nil || freightTemplateID == 0 {
errList.AddErr(fmt.Errorf("创建运费模板失败:%v", err))
} else { //绑定
if err = ShopBindStoreFreight(vendorOrgCode, vendorStoreID, freightTemplateID); err != nil {