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-02-18 11:55:47 +08:00
parent 0ca51ca7fc
commit 66194c55f9
5 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1266,6 +1266,17 @@ 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)+`}`)
@@ -3950,3 +3961,15 @@ func GetBrandStore(ctx *jxcontext.Context, name string) (brands []*model.BrandSt
err = dao.GetRows(db, &brands, sql, sqlParams) err = dao.GetRows(db, &brands, sql, sqlParams)
return brands, err return brands, err
} }
func RefreshMTWMToken(ctx *jxcontext.Context) (err error) {
// var (
// db = dao.GetDB()
// )
// if time.Now().Weekday() != time.Sunday {
// return
// }
// //token是1个月过期，每周刷一次吧
// dao.GetStoresMapList(db, []int{model.VendorIDMTWM}, nil, nil, status, isSync, "", "", globals.Mtwm2Code)
return err
}

4
business/jxstore/misc/misc.go
View File

@@ -275,6 +275,10 @@ func Init() {
ScheduleTimerFunc("RefreshCouponsStatus", func() { ScheduleTimerFunc("RefreshCouponsStatus", func() {
localjx.RefreshCouponsStatus(jxcontext.AdminCtx) localjx.RefreshCouponsStatus(jxcontext.AdminCtx)
}, updateActStatusTimeList) }, updateActStatusTimeList)
//刷新美团商超门店Token
ScheduleTimerFunc("RefreshMTWMToken", func() {
cms.RefreshMTWMToken(jxcontext.AdminCtx)
}, updateActStatusTimeList)
} }
ScheduleTimerFunc("AutoSaleStoreSku", func() { ScheduleTimerFunc("AutoSaleStoreSku", func() {
cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false) cms.AutoSaleStoreSku(jxcontext.AdminCtx, nil, false)

1
business/model/vendor_org_code.go
View File

@@ -17,4 +17,5 @@ type VendorOrgCode struct {
IsJxCat int `json:"isJxCat"` //是否使用京西分类，0默认使用 IsJxCat int `json:"isJxCat"` //是否使用京西分类，0默认使用
IsOpen int `json:"isOpen"` //主要三方配送用，是否配送，默认0表示打开，1表示关 IsOpen int `json:"isOpen"` //主要三方配送用，是否配送，默认0表示打开，1表示关
EmpowerURL string `orm:"column(empower_url)" json:"empowerURL"` //授权地址 EmpowerURL string `orm:"column(empower_url)" json:"empowerURL"` //授权地址
StoreBrandName string `json:"storeBrandName"` //建店品牌名（和饿百供应商不同，美团是根据平台账号划分）
} }

39
business/partner/purchase/ebai/store.go
View File

@@ -98,30 +98,14 @@ var (
}, },
EbaiSupplierIDgy: &tEbaiSupplierInfo{ EbaiSupplierIDgy: &tEbaiSupplierInfo{
SupplierID: EbaiSupplierIDgy, SupplierID: EbaiSupplierIDgy,
Logo: "https://fuss10.elemecdn.com/1/34/c6d76d8e3aa86cf214e6bff5514c1jpeg.jpeg", Logo: "https://fuss10.elemecdn.com/7/21/a4b2877a916e1af6c5bdbf5945d51jpeg.jpeg",
Categorys: []map[string]interface{}{ Categorys: []map[string]interface{}{
map[string]interface{}{ map[string]interface{}{
"category1": 277, "category1": 274,
"category2": 180, "category2": 190,
},
map[string]interface{}{
"category1": 277,
"category2": 184,
},
map[string]interface{}{
"category1": 277,
"category2": 183,
},
map[string]interface{}{
"category1": 277,
"category2": 181,
},
map[string]interface{}{
"category1": 277,
"category2": 182,
}, },
}, },
BusinessFormID: 1917869373, BusinessFormID: 1917867465,
BrandName: "京西果园", BrandName: "京西果园",
}, },
} }
@@ -682,9 +666,6 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
param["phone"] = phone param["phone"] = phone
param["ivr_phone"] = phone param["ivr_phone"] = phone
param["service_phone"] = storeDetail.Tel1 param["service_phone"] = storeDetail.Tel1
// param["phone"] = "18160030913"
// param["ivr_phone"] = "18160030913"
// param["service_phone"] = "18160030913"
param["address"] = storeDetail.Address param["address"] = storeDetail.Address
param["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) param["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng)
param["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) param["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat)
@@ -804,13 +785,13 @@ func (c *PurchaseHandler) SyncQualify(ctx *jxcontext.Context, storeDetail *dao.S
idMap["license_number"] = storeDetail.IDCode idMap["license_number"] = storeDetail.IDCode
idMap["legal_representative_name"] = storeDetail.IDName idMap["legal_representative_name"] = storeDetail.IDName
idMap["license_name"] = storeDetail.IDName idMap["license_name"] = storeDetail.IDName
// idCardFront, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardFront, nil) idCardFront, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardFront, nil)
// idCardBack, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardBack, nil) idCardBack, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardBack, nil)
// idCardHand, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardHand, nil) idCardHand, _ := api.EbaiAPI.PictureUpload(storeDetail.IDCardHand, nil)
idCardFront, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/db790784e3a06202d00706c3141035dd.jpg", nil) // idCardFront, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/db790784e3a06202d00706c3141035dd.jpg", nil)
idCardBack, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/45a7aae6758edb33f5dc2656358b1afb.jpg", nil) // idCardBack, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/45a7aae6758edb33f5dc2656358b1afb.jpg", nil)
idCardHand, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/2d47385bbcb211bb08c8c0b76f5b7a21.jpg", nil) // idCardHand, _ := api.EbaiAPI.PictureUpload("http://image.jxc4.com/image/2d47385bbcb211bb08c8c0b76f5b7a21.jpg", nil)
idMap["photos"] = []map[string]interface{}{ idMap["photos"] = []map[string]interface{}{
map[string]interface{}{ map[string]interface{}{
"photo_url": idCardFront, "photo_url": idCardFront,

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

@@ -97,6 +97,18 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
} }
func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string, params map[string]interface{}, storeDetail *dao.StoreDetail) (vendorStoreID string, err error) { func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string, params map[string]interface{}, storeDetail *dao.StoreDetail) (vendorStoreID string, err error) {
poiSettleSaveParam := &mtwmapi.PoiSettleSaveParam{
Type: 0, //创建
ApplyInfos: []*mtwmapi.ApplyInfo{
&mtwmapi.ApplyInfo{
MultiPoiBasicInfo: &mtwmapi.MultiPoiBasicInfo{
Name: params["vendorStoreName"].(string),
},
},
},
}
mtapi := getAPI(storeDetail.VendorOrgCode, storeDetail.ID, "")
mtapi.PoiSettleSave(poiSettleSaveParam)
return vendorStoreID, err return vendorStoreID, err
} }