diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 0916d2e33..85582cbee 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1892,7 +1892,7 @@ func SyncStoresCourierInfo(ctx *jxcontext.Context, storeIDs []int, isAsync, isCo func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { vendorID := batchItemList[0].(int) storeDetail2, err := dao.GetStoreDetail2(db, store.ID, "", vendorID) - if err == nil && storeDetail2.VendorStoreID != "" && storeDetail2.CourierStatus != model.StoreStatusDisabled { + if err == nil && storeDetail2.VendorStoreID != "" /*&& storeDetail2.CourierStatus != model.StoreStatusDisabled*/ { if handler := partner.GetDeliveryPlatformFromVendorID(vendorID); handler != nil { if updateHandler, ok := handler.Handler.(partner.IDeliveryUpdateStoreHandler); ok { updateHandler.UpdateStore(ctx, storeDetail2) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 0c73806cd..0c489e57f 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -122,6 +122,7 @@ func Init() { func doDailyWork() { globals.SugarLogger.Debug("doDailyWork") + cms.SyncStoresCourierInfo(jxcontext.AdminCtx, nil, false, true) netprinter.RebindAllPrinters(jxcontext.AdminCtx, false, true) // cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, true, true) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 25f4594b8..559300b3d 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -124,8 +124,8 @@ func StoreDetail2ShopInfo(storeDetail *dao.StoreDetail2) (shopInfo *dadaapi.Shop cityName = districtName districtName, _ = api.AutonaviAPI.GetCoordinateTownInfo(lng, lat) } - if dadaDistrictMap[storeDetail.DistrictName] != "" { - storeDetail.DistrictName = dadaDistrictMap[storeDetail.DistrictName] + if dadaDistrictMap[districtName] != "" { + districtName = dadaDistrictMap[storeDetail.DistrictName] } } shopInfo = &dadaapi.ShopInfo{