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

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-01 11:32:36 +08:00
parent 46278ea30f
commit 7996e34d5d
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1192,7 +1192,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
return nil, fmt.Errorf("必须指定平台分账号信息") return nil, fmt.Errorf("必须指定平台分账号信息")
} }
if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil { if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
if vendorOrgCode != "5873" { if vendorOrgCode != globals.Mtwm2Code {
store, err2 := handler.ReadStore(ctx, vendorOrgCode, storeMap.VendorStoreID) store, err2 := handler.ReadStore(ctx, vendorOrgCode, storeMap.VendorStoreID)
if err = err2; err == nil || storeMap.IsSync == 0 { if err = err2; err == nil || storeMap.IsSync == 0 {
if store != nil { if store != nil {
@@ -1200,9 +1200,16 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
storeMap.Status = store.Status storeMap.Status = store.Status
} }
err = nil err = nil
storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress // 新增绑定门店是修改的概念 }
} else {
//美团商超获取token
mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, outStoreMap.VendorOrgCode).(*mtwmapi.API)
if token, err := mtapi.GetAccessToken2(outStoreMap.VendorStoreID); err == nil && token != nil {
storeMap.MtwmToken = token.AccessToken
storeMap.MtwmToken = token.RefreshToken
} }
} }
storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress // 新增绑定门店是修改的概念
} else { } else {
err = ErrCanNotFindVendor err = ErrCanNotFindVendor
} }
@@ -1262,7 +1269,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
} }
dao.Commit(db) dao.Commit(db)
outStoreMap = storeMap outStoreMap = storeMap
_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
} else { } else {
dao.Rollback(db) dao.Rollback(db)
} }
@@ -1277,21 +1283,11 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
if _, err = SetStoreSkuSyncStatus2(db, []int{storeID}, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil { if _, err = SetStoreSkuSyncStatus2(db, []int{storeID}, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
// CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true) // CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true)
} }
} else if vendorID == model.VendorIDMTWM {
//如果是绑的美团超市，要去更新token
if outStoreMap.VendorOrgCode == globals.Mtwm2Code {
mtapi := apimanager.CurAPIManager.GetAPI(model.VendorIDMTWM, outStoreMap.VendorOrgCode).(*mtwmapi.API)
if result, err := mtapi.GetOAuthCode(outStoreMap.VendorStoreID); result != nil && err == nil {
if token, err := mtapi.GetAccessToken(result.(string)); err == nil && token != nil {
outStoreMap.MtwmToken = token.(string)
dao.UpdateEntity(db, outStoreMap, "MtwmToken")
}
}
}
} }
if globals.IsAddEvent { if globals.IsAddEvent {
err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`) err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
} }
_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
_, err = CurVendorSync.FullSyncStoresSkus(ctx, db, []int{vendorID}, []int{storeID}, true, nil, true, true) _, err = CurVendorSync.FullSyncStoresSkus(ctx, db, []int{vendorID}, []int{storeID}, true, nil, true, true)
return outStoreMap, err return outStoreMap, err
} }

14
business/jxstore/tempop/tempop.go
View File

@@ -1865,6 +1865,20 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// }, storeMaps) // }, storeMaps)
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// _, err = task.GetResult(0) // _, err = task.GetResult(0)
for i := 1; i < 26; i++ {
result, _ := api.JdShop2API.ShopList(i)
for _, v := range result.List {
storeDetail, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int2Str(v.StoreID), model.VendorIDJDShop, "2")
err = api.JdShop2API.CreateGisFence(v.StoreID)
start, end := jxutils.JxOperationTime2StrTime(storeDetail.OpenTime1), jxutils.JxOperationTime2StrTime(storeDetail.CloseTime1)
if storeDetail.CloseTime2 != 0 {
end = jxutils.JxOperationTime2StrTime(storeDetail.CloseTime2)
}
err = api.JdShop2API.UpdateDeliveryPromise(start, end, v.StoreID)
break
}
break
}
return err return err
} }