From c7a751933bf3e068303c199eaef565190aff0c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Sun, 7 Feb 2021 11:42:32 +0800 Subject: [PATCH] aa --- business/jxstore/cms/store.go | 3 +++ business/partner/purchase/ebai/store.go | 28 +++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 7c6baa2ae..8d1a5de53 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3911,6 +3911,9 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma } } } + if payload["storeVendorName"] == nil { + return fmt.Errorf("请输入平台名!") + } handler := partner.GetPurchasePlatformFromVendorID(vendorID) vendorStoreID, err := handler.CreateStore2(db, storeID, ctx.GetUserName(), payload, storeDetail) if err != nil { diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 31682a0a1..697c370fa 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -643,24 +643,20 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri placeCounty, err := dao.GetPlaceByCode(db, storeDetail.DistrictCode) param["county"] = placeCounty.EbaiCode - // phone := "" - // if storeDetail.MarketManPhone != "" { - // phone = storeDetail.MarketManPhone - // } else { - // phone = model.VendorStoreTel - // } - ebaiInfo := EbaiSupplierInfo[param["supplier_id"].(string)] - if ebaiInfo.SupplierID == EbaiSupplierIDsc { - param["name"] = storeDetail.Name + phone := "" + if storeDetail.MarketManPhone != "" { + phone = storeDetail.MarketManPhone } else { - param["name"] = ebaiInfo.BrandName + "(" + storeDetail.Name + ")" + phone = model.VendorStoreTel } - // param["phone"] = phone - // param["ivr_phone"] = phone - // param["service_phone"] = storeDetail.Tel1 - param["phone"] = "18160030913" - param["ivr_phone"] = "18160030913" - param["service_phone"] = "18160030913" + ebaiInfo := EbaiSupplierInfo[param["supplier_id"].(string)] + param["name"] = params["vendorStoreName"] + param["phone"] = phone + param["ivr_phone"] = phone + param["service_phone"] = storeDetail.Tel1 + // param["phone"] = "18160030913" + // param["ivr_phone"] = "18160030913" + // param["service_phone"] = "18160030913" param["address"] = storeDetail.Address param["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng) param["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat)