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-23 13:49:18 +08:00
parent 8c7cc822ac c444e9a47a
commit 27ebd2e41b
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6018,23 +6018,30 @@ func GetVendorOrgCode(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID i
//批量辅助创建电子围栏 //批量辅助创建电子围栏
func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error) { func AssistCreateFence(relInfo map[string][]tiktok_store.RelInfo) (string, error) {
var ( var (
tempFenceID string
db = dao.GetDB() db = dao.GetDB()
errList = errlist.New()
FreightTemplate = &model.FreightTemplate{} FreightTemplate = &model.FreightTemplate{}
) )
errList := errlist.New()
globals.SugarLogger.Debugf("进入AssistCreateFence")
for k, v := range relInfo { for k, v := range relInfo {
globals.SugarLogger.Debugf("v[0].VendorStoreID============%s v[0].StoreID============%s", v[0].VendorStoreID, v[0].StoreID)
for _, i := range v { for _, i := range v {
globals.SugarLogger.Debugf("preTest i.StoreID========%s,i.VendorStoreID=========%s", i.StoreID, i.VendorStoreID)
tempStoreID := utils.Str2Int64(i.StoreID) tempStoreID := utils.Str2Int64(i.StoreID)
if fenceID, err := tiktok_store.CreateFenceByStore(k, tempStoreID); err != nil { tempVendorStoreID := utils.Str2Int64(i.VendorStoreID)
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s) 创建电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) //暂时逻辑直接使用storeID
} else { if ifBindFence, err := tiktok_store.GetFence(k, i.StoreID); err == nil && len(ifBindFence.OutFenceId) != 0 {
tempVendorStoreID := utils.Str2Int64(i.VendorStoreID) tempFenceID = i.StoreID
if err := tiktok_store.BindFenceByStore(k, tempVendorStoreID, []string{fenceID}); err != nil { }
errList.AddErr(fmt.Errorf("平台门店(%s),门店(%s)绑定电子围栏失败:%v", i.VendorStoreID, i.StoreID, err)) 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 {
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))
} }
} }
if err := dao.CreateEntity(db, FreightTemplate); err != nil { if err := dao.CreateEntity(db, FreightTemplate); err != nil {

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

@@ -175,9 +175,7 @@ func UpdateFenceByStore(appOrgCode, outFenceID string, storeID int) error {
localStore *LocalStore localStore *LocalStore
vertex []warehouse_setFence_request.VerticesItem vertex []warehouse_setFence_request.VerticesItem
) )
sqlParam := []interface{}{ sqlParam := []interface{}{}
model.VendorIDDD,
}
sqlStr := `SELECT t.lng,t.lat,t.delivery_range_type,t.delivery_range FROM store t` sqlStr := `SELECT t.lng,t.lat,t.delivery_range_type,t.delivery_range FROM store t`
if storeID != 0 { if storeID != 0 {
sqlStr += " WHERE t.id = ? " sqlStr += " WHERE t.id = ? "