! 美团外卖与饿百门店只更新营业相关的状态

This commit is contained in:
gazebo
2019-03-29 12:13:36 +08:00
parent e17afbd4b9
commit 719579c110
3 changed files with 43 additions and 28 deletions

View File

@@ -201,9 +201,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
} }
return err return err
} }
params := genStoreMapFromStore(store) // todo 饿百 开店审核通过后不允许修改商户信息
if err = api.EbaiAPI.ShopUpdate(params); err == nil { // params := genStoreMapFromStore(store)
} // if err = api.EbaiAPI.ShopUpdate(params); err == nil {
// }
} }
} }
} }

View File

@@ -122,7 +122,7 @@ func openTimeJX2Mtwm(times [][2]int16) string {
} }
func bizStatusMtwm2JX(openLevel, online int) int { func bizStatusMtwm2JX(openLevel, online int) int {
if online == mtwmapi.PoiOffline { if online == mtwmapi.PoiStatusOffline {
return model.StoreStatusDisabled return model.StoreStatusDisabled
} else { } else {
if openLevel == mtwmapi.PoiOpenLevelHaveRest { if openLevel == mtwmapi.PoiOpenLevelHaveRest {
@@ -134,11 +134,11 @@ func bizStatusMtwm2JX(openLevel, online int) int {
func bizStatusJX2Mtwm(status int) (openLevel, online int) { func bizStatusJX2Mtwm(status int) (openLevel, online int) {
if status == model.StoreStatusDisabled { if status == model.StoreStatusDisabled {
return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiOffline return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOffline
} else if status == model.StoreStatusClosed { } else if status == model.StoreStatusClosed {
return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiOnline return mtwmapi.PoiOpenLevelHaveRest, mtwmapi.PoiStatusOnline
} }
return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiOnline return mtwmapi.PoiOpenLevelNormal, mtwmapi.PoiStatusOnline
} }
func skuStatusJX2Mtwm(status int) int { func skuStatusJX2Mtwm(status int) int {

View File

@@ -12,7 +12,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
) )
@@ -103,30 +102,45 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
if err != nil { if err != nil {
return err return err
} }
remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) // remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
if err != nil { // if err != nil {
return err // return err
} // }
openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}}
if storeDetail.OpenTime2 > 0 { if storeDetail.OpenTime2 > 0 {
openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2})
} }
params := map[string]interface{}{ // params := map[string]interface{}{
"name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), // "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
"phone": storeDetail.Tel1, // "phone": storeDetail.Tel1,
"shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)), // "shipping_fee": jxutils.IntPrice2Standard(int64(storeDetail.DeliveryFee)),
"shipping_time": openTimeJX2Mtwm(openTime), // "shipping_time": openTimeJX2Mtwm(openTime),
"third_tag_name": "蔬菜", // "third_tag_name": "蔬菜",
} // }
if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 { // if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 {
params["address"] = storeDetail.Address // params["address"] = storeDetail.Address
params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) // params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng)
params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) // params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat)
} // }
params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus)) // params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus))
globals.SugarLogger.Debug(utils.Format4Output(params, false)) // globals.SugarLogger.Debug(utils.Format4Output(params, false))
if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { // if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) // err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params)
// }
if err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime)); err == nil {
openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus))
if isOnline == mtwmapi.PoiStatusOffline {
err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID)
} else {
err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID)
}
if err == nil {
if openLevel == mtwmapi.PoiOpenLevelHaveRest {
err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID)
} else {
err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID)
}
}
} }
return err return err
} }