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

- 获取平台门店信息后，更新本地DeliveryType

Browse Source
This commit is contained in:
gazebo
2019-07-29 17:18:06 +08:00
parent bda7a4edb2
commit 1a8bcef392
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1349,6 +1349,8 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
CloseTime1: store.CloseTime1, CloseTime1: store.CloseTime1,
OpenTime2: store.OpenTime2, OpenTime2: store.OpenTime2,
CloseTime2: store.CloseTime2, CloseTime2: store.CloseTime2,
DeliveryType: store.DeliveryType,
}} }}
} }
} }
@@ -1391,7 +1393,8 @@ func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.V
for _, v := range storeMapList { for _, v := range storeMapList {
if snapshot := snapshotMap[jxutils.Combine2Int(v.StoreID, v.VendorID)]; snapshot != nil && v.Status != snapshot.Status { if snapshot := snapshotMap[jxutils.Combine2Int(v.StoreID, v.VendorID)]; snapshot != nil && v.Status != snapshot.Status {
v.Status = snapshot.Status v.Status = snapshot.Status
if _, err = dao.UpdateEntity(db, v, model.FieldStatus); err != nil { v.DeliveryType = snapshot.DeliveryType
if _, err = dao.UpdateEntity(db, v, model.FieldStatus, "DeliveryType"); err != nil {
return err return err
} }
} }

1
business/model/store.go
View File

@@ -402,6 +402,7 @@ type VendorStoreSnapshot struct {
CloseTime1 int16 `json:"closeTime1"` // 格式同上 CloseTime1 int16 `json:"closeTime1"` // 格式同上
OpenTime2 int16 `json:"openTime2"` // 格式同上 OpenTime2 int16 `json:"openTime2"` // 格式同上
CloseTime2 int16 `json:"closeTime2"` // 格式同上 CloseTime2 int16 `json:"closeTime2"` // 格式同上
DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
} }
func (*VendorStoreSnapshot) TableUnique() [][]string { func (*VendorStoreSnapshot) TableUnique() [][]string {

4
business/partner/purchase/jd/store.go
View File

@@ -277,9 +277,9 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask
// } // }
func JdDeliveryType2Jx(deliveryType int) int8 { func JdDeliveryType2Jx(deliveryType int) int8 {
if deliveryType == 2938 { if deliveryType == jdapi.CarrierNoSelfDelivery {
return scheduler.StoreDeliveryTypeByStore return scheduler.StoreDeliveryTypeByStore
} else if deliveryType == 9966 { } else if deliveryType == jdapi.CarrierNoCrowdSourcing {
return scheduler.StoreDeliveryTypeCrowdSourcing return scheduler.StoreDeliveryTypeCrowdSourcing
} }
return scheduler.StoreDeliveryTypeByPlatform return scheduler.StoreDeliveryTypeByPlatform

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

@@ -68,17 +68,18 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string
retVal.ID = int(utils.Str2Int64WithDefault(poiCode, 0)) retVal.ID = int(utils.Str2Int64WithDefault(poiCode, 0))
retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
var deliveryRangeInfo []map[string]interface{} var deliveryRangeInfo []map[string]interface{}
deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode)
if err != nil {
deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode) deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode)
if err != nil {
deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode)
} }
if err == nil { if err == nil {
if len(deliveryRangeInfo) > 0 { if len(deliveryRangeInfo) > 0 {
retVal.DeliveryRange = rangeMtwm2JX(deliveryRangeInfo[0]["area"].(string)) retVal.DeliveryRange = rangeMtwm2JX(deliveryRangeInfo[0]["area"].(string))
if utils.Interface2String(deliveryRangeInfo[0]["logistics_code"]) == mtwmapi.PeiSongTypeSelf { logisticsCode := utils.Interface2String(deliveryRangeInfo[0]["logistics_code"])
if logisticsCode == "" || logisticsCode == mtwmapi.PeiSongTypeSelf {
retVal.DeliveryType = scheduler.StoreDeliveryTypeByStore retVal.DeliveryType = scheduler.StoreDeliveryTypeByStore
} else { } else {
retVal.DeliveryType = scheduler.StoreDeliveryTypeCrowdSourcing retVal.DeliveryType = scheduler.StoreDeliveryTypeByPlatform
} }
} }
} }