diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index efba276f2..681458988 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -15,14 +15,16 @@ import ( const ( EbaiSupplierIDsc = "1486975681715" - EbaiSupplierIDc4 = "2233065879" + EbaiSupplierIDc4 = "22267134648" + EbaiSupplierIDhc = "2233065879" EbaiSupplierIDgy = "2267230126" ) var ( EbaiSupplierIDMap = map[string]string{ EbaiSupplierIDsc: "饿百商超", - EbaiSupplierIDc4: "饿百好菜", + EbaiSupplierIDc4: "饿百菜市", + EbaiSupplierIDhc: "饿百好菜", EbaiSupplierIDgy: "饿百果园", } ) diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index fd970cce4..2e5351cc8 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -21,24 +21,68 @@ import ( type tEbaiSupplierInfo struct { SupplierID string `json:"supplierID"` Logo string `json:"logo"` - CategoryID1 int - CategoryID2 int + Categorys []map[string]interface{} BusinessFormID int //门店业态 } var ( ebaiSupplierInfo = map[string]*tEbaiSupplierInfo{ EbaiSupplierIDsc: &tEbaiSupplierInfo{ - SupplierID: EbaiSupplierIDsc, - Logo: "http://image.jxc4.com/image/4573e7789c647d4961f8955e3733dbd6.tem.jpg", - CategoryID1: 166, - CategoryID2: 222, + SupplierID: EbaiSupplierIDsc, + Logo: "http://image.jxc4.com/image/212c268d26f6237e33ba269d24e2f76b.jpg", + Categorys: []map[string]interface{}{ + map[string]interface{}{ + "category1": 166, + "category2": 222, + }, + }, BusinessFormID: 1672214913, }, + EbaiSupplierIDhc: &tEbaiSupplierInfo{ + SupplierID: EbaiSupplierIDhc, + Logo: "https://fuss10.elemecdn.com/1/ce/e94124a856ea83d733832ca05b269jpeg.jpeg", + Categorys: []map[string]interface{}{ + map[string]interface{}{ + "category1": 277, + "category2": 180, + }, + map[string]interface{}{ + "category1": 277, + "category2": 184, + }, + map[string]interface{}{ + "category1": 277, + "category2": 183, + }, + map[string]interface{}{ + "category1": 274, + "category2": 190, + }, + }, + BusinessFormID: 1917869373, + }, EbaiSupplierIDc4: &tEbaiSupplierInfo{ - SupplierID: EbaiSupplierIDc4, - Logo: "", - BusinessFormID: 2233065879, + SupplierID: EbaiSupplierIDc4, + Logo: "https://fuss10.elemecdn.com/1/34/c6d76d8e3aa86cf214e6bff5514c1jpeg.jpeg", + Categorys: []map[string]interface{}{ + map[string]interface{}{ + "category1": 277, + "category2": 180, + }, + map[string]interface{}{ + "category1": 277, + "category2": 184, + }, + map[string]interface{}{ + "category1": 277, + "category2": 183, + }, + map[string]interface{}{ + "category1": 274, + "category2": 190, + }, + }, + BusinessFormID: 1917869373, }, } ) @@ -609,12 +653,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri param["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat) param["coord_type"] = "amap" //高德坐标系 param["shop_logo"] = ebaiInfo.Logo - param["categorys"] = []map[string]int{ - map[string]int{ - "category1": ebaiInfo.CategoryID1, - "category2": ebaiInfo.CategoryID2, - }, - } + param["categorys"] = ebaiInfo.Categorys time1map := map[string]string{ "start": jxutils.JxOperationTime2StrTime(storeDetail.OpenTime1), "end": jxutils.JxOperationTime2StrTime(storeDetail.CloseTime1),