From 464692ae0be2fa7a398f86a1695dd1bb26c38424 Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 24 Jul 2019 17:24:48 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8DUpdateOrCreateCourierStor?= =?UTF-8?q?es=E4=B8=AD=E5=BF=AB=E9=80=92=E9=97=A8=E5=BA=97=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index f49b9f0c2..efb7fe52b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1074,7 +1074,7 @@ func updateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDetail2) ( if handlerInfo := partner.GetDeliveryPlatformFromVendorID(storeDetail.VendorID); handlerInfo != nil && handlerInfo.Use4CreateWaybill { if updateHandler, ok := handlerInfo.Handler.(partner.IDeliveryUpdateStoreHandler); ok { - storeDetail.CourierStoreName = composeDadaStoreName(storeDetail) + storeDetail.CourierStoreName = composeCourierStoreName(storeDetail) err = updateHandler.UpdateStore(ctx, storeDetail) } } @@ -1110,9 +1110,9 @@ func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDe if storeDetail.CityName == "" { return false, fmt.Errorf("门店的城市码有问题，请检查") } - storeDetail.CourierStoreName = composeDadaStoreName(storeDetail) + storeDetail.CourierStoreName = composeCourierStoreName(storeDetail) if _, err = handlerInfo.Handler.GetStore(ctx, 0, storeDetail.VendorStoreID); err != nil { - if !handlerInfo.Handler.IsErrStoreNotExist(err) { + if handlerInfo.Handler.IsErrStoreNotExist(err) { storeDetail.VendorStoreID, storeDetail.AuditStatus, err = handlerInfo.Handler.CreateStore(ctx, storeDetail) isCreated = true } @@ -1125,7 +1125,7 @@ func updateOrCreateCourierStore(ctx *jxcontext.Context, storeDetail *dao.StoreDe } if err != nil { err = fmt.Errorf("门店ID:%d,门店名:%s,错误描述:%s", storeDetail.Store.ID, storeDetail.Name, err.Error()) - globals.SugarLogger.Debugf("updateOrCreateDadaStore storeID:%d failed with error:%v", storeDetail.ID, err) + globals.SugarLogger.Debugf("updateOrCreateCourierStore storeID:%d failed with error:%v", storeDetail.ID, err) } } return isCreated, err @@ -1153,15 +1153,17 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd storeID := batchItemList[0].(int) errList := errlist.New() db := dao.GetDB() - for k, v := range partner.DeliveryPlatformHandlers { + for vendorID, v := range partner.DeliveryPlatformHandlers { if v.Use4CreateWaybill { if _, ok := v.Handler.(partner.IDeliveryUpdateStoreHandler); ok { - storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", k) + storeDetail, err2 := dao.GetStoreDetail2(db, storeID, "", vendorID) if err = err2; err2 == nil { - isStoreExist := storeDetail.VendorStoreID != "" - storeDetail.VendorStoreID = utils.Int2Str(storeDetail.ID) - if isForceUpdate || !isStoreExist { + if isForceUpdate || storeDetail.VendorStoreID == "" { var isCreated bool + if storeDetail.VendorStoreID == "" { + storeDetail.VendorID = vendorID + storeDetail.VendorStoreID = utils.Int2Str(storeDetail.ID) + } if isCreated, err = updateOrCreateCourierStore(ctx, storeDetail); err == nil && isCreated { storeCourier := &model.StoreCourierMap{ VendorStoreID: storeDetail.VendorStoreID, @@ -1195,7 +1197,7 @@ func UpdateOrCreateCourierStores(ctx *jxcontext.Context, storeID int, isForceUpd return hint, err } -func composeDadaStoreName(storeDetail *dao.StoreDetail2) (storeName string) { +func composeCourierStoreName(storeDetail *dao.StoreDetail2) (storeName string) { return storeDetail.Name + "-" + storeDetail.VendorStoreID }