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:
邹宗楠
2022-11-01 10:31:05 +08:00
parent 84bf0e2e0d 8911b2cd6b
commit 16e2d3c4d8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5871,14 +5871,16 @@ func GetDDScope(ctx *jxcontext.Context, storeID int, vendorStoreID string) (ware
return data, errors.New("storeID,vendorStoreID 必填")
}
storeMap, err := GetVendorOrgCode(ctx, dao.GetDB(), storeID, model.VendorIDDD, vendorStoreID)
globals.SugarLogger.Debug("len(storeMap)=================%d", len(storeMap))
if err != nil {
return data, errors.New(fmt.Sprintf("获取vendorOrgCode失败，请检查数据或重试:%v", err))
}
globals.SugarLogger.Debug("storeMap[0].VendorOrgCode=================%d", storeMap[0].VendorOrgCode)
bindWarehouse, err := tiktok_store.GetWarehouseByStore(storeMap[0].VendorOrgCode, int64(storeID))
if err != nil {
return data, errors.New(fmt.Sprintf("获取门店(%d) 绑定fenceID失败:%v", storeID, err))
}
globals.SugarLogger.Debug("len(bindWarehouse),bindWarehouse[0][utils.Str2Int(vendorStoreID)].OutFenceIds[0]=================%d", len(bindWarehouse), bindWarehouse[0][utils.Str2Int(vendorStoreID)].OutFenceIds[0])
resp, err := tiktok_store.GetFence(storeMap[0].VendorOrgCode, bindWarehouse[0][utils.Str2Int(vendorStoreID)].OutFenceIds[0])
if err != nil {
return data, err

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

@@ -14,6 +14,7 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"strings"
)
@@ -77,6 +78,8 @@ func GetWarehouseByStore(appOrgCode string, storeID int64) (map[int64][]warehous
if err != nil {
return nil, err
}
globals.SugarLogger.Debugf("err===================== %v", err)
globals.SugarLogger.Debugf("info============%d,,,,,,,,,,,%s", info[0][62490423].WarehouseId, info[0][62490423].OutFenceIds[0])
return info, nil
}