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-12-06 17:35:45 +08:00
parent f2e7ff0757 08ae4fd941
commit 3fe3890f7d
3 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5921,14 +5921,14 @@ func UpdateStoreRelInformation(ctx *jxcontext.Context) error {
case 0: //(1)仓库以及电子围栏
if bindWarehouse, err := tiktok_store.GetWarehouseByStore(i, m); err != nil {
errList.AddErr(fmt.Errorf("同步任务: 获取门店(%s)绑定的仓库以及电子围栏失败:%v", n, err))
} else if len(bindWarehouse[utils.Str2Int64(i)][0].OutFenceIds) > 0 {
for _, s := range bindWarehouse[utils.Str2Int64(i)][0].OutFenceIds {
} else if len(bindWarehouse[i][0].OutFenceIds) > 0 {
for _, s := range bindWarehouse[i][0].OutFenceIds {
if s == n {
FreightTemplate.FenceID = s
}
}
} else {
FreightTemplate.WarehouseID = bindWarehouse[utils.Str2Int64(i)][0].WarehouseId
FreightTemplate.WarehouseID = bindWarehouse[i][0].WarehouseId
}
case 1: //(2)运费模板
if bindFreightIDs, err := tiktok_store.GetStoreFreight(i, m); err != nil {
@@ -5971,36 +5971,26 @@ func UpdateStoreRelInformation(ctx *jxcontext.Context) error {
}
//获取抖店门店建议范围 （即电子围栏）
func GetDDScope(ctx *jxcontext.Context, storeID int, vendorStoreID string) (warehouse_getFences_response.FencesItem, error) {
var (
data warehouse_getFences_response.FencesItem
)
func GetDDScope(ctx *jxcontext.Context, storeID int, vendorStoreID string) ([]warehouse_getFences_response.FencesItem, error) {
if storeID == 0 || len(vendorStoreID) == 0 {
return data, errors.New("storeID,vendorStoreID 必填")
return nil, errors.New("storeID,vendorStoreID 必填")
}
storeMap, err := GetVendorOrgCode(ctx, dao.GetDB(), storeID, model.VendorIDDD, vendorStoreID)
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, utils.Str2Int64(vendorStoreID))
if err != nil {
return data, errors.New(fmt.Sprintf("获取门店(%d) 绑定fenceID失败:%v", storeID, err))
}
if utils.IsNil(bindWarehouse) || len(bindWarehouse) == 0 {
return data, nil
if storeMap, err := GetVendorOrgCode(ctx, dao.GetDB(), storeID, model.VendorIDDD, vendorStoreID); err != nil {
return nil, errors.New(fmt.Sprintf("获取vendorOrgCode失败，请检查数据或重试:%v", err))
} else {
globals.SugarLogger.Debug("bindWarehouse[int64(storeID)][utils.Str2Int(vendorStoreID)].OutFenceIds====%v", bindWarehouse[utils.Str2Int64(vendorStoreID)][0].OutFenceIds)
if utils.IsNil(bindWarehouse[utils.Str2Int64(vendorStoreID)][0].OutFenceIds) || len(bindWarehouse[utils.Str2Int64(vendorStoreID)][0].OutFenceIds) == 0 {
return data, nil
if bind, err := tiktok_store.GetWarehouseByStore(storeMap[0].VendorOrgCode, utils.Str2Int64(vendorStoreID)); err != nil {
return nil, errors.New(fmt.Sprintf("获取门店(%d) 仓库以及电子围栏信息失败:%v", storeID, err))
} else {
resp, err := tiktok_store.GetFence(storeMap[0].VendorOrgCode, bindWarehouse[utils.Str2Int64(vendorStoreID)][0].OutFenceIds[0])
if err != nil {
return data, errors.New(fmt.Sprintf("获取门店(%d) 电子围栏失败:%v", storeID, err))
if len(bind) != 0 && len(bind[vendorStoreID][0].OutFenceIds) != 0 {
if resp, err := tiktok_store.GetFence(storeMap[0].VendorOrgCode, bind[vendorStoreID][0].OutFenceIds); err != nil {
return nil, errors.New(fmt.Sprintf("获取门店(%d) 电子围栏失败:%v", storeID, err))
} else {
return resp, nil
}
}
return resp, nil
}
}
return nil, nil
}
//获取 VendorOrgCode
@@ -6024,6 +6014,7 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error
endStr = ""
db = dao.GetDB()
errList = errlist.New()
ctx *jxcontext.Context
FreightTemplate = &model.FreightTemplate{}
)
for k, v := range relInfo {
@@ -6043,29 +6034,28 @@ func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error
endStr = tStr1 + "," + tStr2
globals.SugarLogger.Debugf("京西平台没有配送范围的门店ID=%s", endStr)
}
//暂时逻辑直接使用storeID
if ifBindFence, err := tiktok_store.GetFence(k, i.StoreID); err == nil && len(ifBindFence.OutFenceId) != 0 {
tempFenceID = i.StoreID
}
if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil || strings.Contains(fmt.Sprint(err), fmt.Sprint("该电子围栏已经存在，请使用修改接口")) {
if err1 := tiktok_store.UpdateFenceByStore(k, i.StoreID, utils.Str2Int(i.VendorStoreID)); err1 != nil {
if bindFence, err := GetDDScope(ctx, utils.Str2Int(i.StoreID), i.VendorStoreID); err == nil && utils.IsNil(bindFence) != true {
tempFenceID = bindFence[0].OutFenceId
if err1 := tiktok_store.UpdateFenceByStore(k, tempFenceID, utils.Str2Int(i.VendorStoreID)); err1 != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)更新电子围栏失败:%v", i.VendorStoreID, i.StoreID, err1))
} else {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
}
} else if utils.IsNil(fenceID) {
tempFenceID = fenceID
}
if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{tempFenceID}); err != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
} else {
if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
} else if utils.IsNil(fenceID) {
if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil {
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err))
}
}
}
}
if err := dao.CreateEntity(db, FreightTemplate); err != nil {
if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID"); err1 != nil {
globals.SugarLogger.Debugf("db update storeID,vendorStoreID defeat on :%v", err1)
errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
//errList.AddErr(fmt.Errorf("更新操作，同步进数据库错误信息:%v", err1))
} else {
errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
globals.SugarLogger.Debugf("db create storeID,vendorStoreID defeat on :%v", err1)
//errList.AddErr(fmt.Errorf("创建操作，同步进数据库错误信息:%v", err))
}
}
}