From 1a8bcef3923ca6a5322287f9a4af060bc92227fc Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 29 Jul 2019 17:18:06 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E8=8E=B7=E5=8F=96=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=9C=AC=E5=9C=B0DeliveryType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 5 ++++- business/model/store.go | 11 ++++++----- business/partner/purchase/jd/store.go | 4 ++-- business/partner/purchase/mtwm/store.go | 9 +++++---- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index d6ea7e552..790c94e6a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1349,6 +1349,8 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v CloseTime1: store.CloseTime1, OpenTime2: store.OpenTime2, CloseTime2: store.CloseTime2, + + DeliveryType: store.DeliveryType, }} } } @@ -1391,7 +1393,8 @@ func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.V for _, v := range storeMapList { if snapshot := snapshotMap[jxutils.Combine2Int(v.StoreID, v.VendorID)]; snapshot != nil && 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 } } diff --git a/business/model/store.go b/business/model/store.go index 3f73d8d22..87e8bcc1e 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -397,11 +397,12 @@ type VendorStoreSnapshot struct { VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` SnapshotAt time.Time `orm:"type(datetime)" json:"snapshotAt"` // 这个不同于CreatedAt，SnapshotAt是逻辑上的时间，CreatedAt是实际存储的时间 - Status int `json:"status"` // 取值同Store.Status - OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有 - CloseTime1 int16 `json:"closeTime1"` // 格式同上 - OpenTime2 int16 `json:"openTime2"` // 格式同上 - CloseTime2 int16 `json:"closeTime2"` // 格式同上 + Status int `json:"status"` // 取值同Store.Status + OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有 + CloseTime1 int16 `json:"closeTime1"` // 格式同上 + OpenTime2 int16 `json:"openTime2"` // 格式同上 + CloseTime2 int16 `json:"closeTime2"` // 格式同上 + DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型 } func (*VendorStoreSnapshot) TableUnique() [][]string { diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index ae131099a..144ed378d 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -277,9 +277,9 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask // } func JdDeliveryType2Jx(deliveryType int) int8 { - if deliveryType == 2938 { + if deliveryType == jdapi.CarrierNoSelfDelivery { return scheduler.StoreDeliveryTypeByStore - } else if deliveryType == 9966 { + } else if deliveryType == jdapi.CarrierNoCrowdSourcing { return scheduler.StoreDeliveryTypeCrowdSourcing } return scheduler.StoreDeliveryTypeByPlatform diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index c271aa838..50643480a 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -68,17 +68,18 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string retVal.ID = int(utils.Str2Int64WithDefault(poiCode, 0)) retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon var deliveryRangeInfo []map[string]interface{} - deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode) + deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode) if err != nil { - deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode) + deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode) } if err == nil { if len(deliveryRangeInfo) > 0 { 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 } else { - retVal.DeliveryType = scheduler.StoreDeliveryTypeCrowdSourcing + retVal.DeliveryType = scheduler.StoreDeliveryTypeByPlatform } } }