diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index 9788a7a4e..887346ec3 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -67,7 +67,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if updateEntityStoreParam.AddCode == 0 { updateEntityStoreParam.AddCode = store.JdCode } - url, _ := getAPI("2").UploadImageNew(data, "2659335b16e3880e367759b8fc675933.tem.png") + //url, _ := getAPI("2").UploadImageNew(data, "2659335b16e3880e367759b8fc675933.tem.png") ex := store.LicenceExpire if ex == "" { ex = utils.Time2Str(utils.Str2Time(store.LicenceValid).AddDate(20, 0, 0)) @@ -108,16 +108,19 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin detail, _ := api.JdShopAPI.ShopDetail(utils.Str2Int(store.VendorStoreID)) if err == nil { param := &jdshopapi.UpdateBasicParam{ + StoreID: detail.StoreID, StoreName: detail.StoreName, - CategoryID2: 4, + CategoryID2: detail.CategoryID2, Coordinate: detail.Coordinate, - BussinessBeginTime: int2TimeStr(int(store.OpenTime1)), - BussinessEndTime: int2TimeStr(int(store.CloseTime1)), - ImgURL: url, + BussinessBeginTime: detail.BussinessBeginTime, + BussinessEndTime: detail.BussinessEndTime, + ImgURL: detail.ImgURL, StorePhone: detail.StorePhone, AddName: detail.AddName, AddCode3: detail.AddCode3, - CategoryID1: 3, + AddCode1: detail.AddCode1, + AddCode2: detail.AddCode2, + CategoryID1: detail.CategoryID1, } var ( url3 string @@ -174,38 +177,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin }, } } - if store.JdsStreetCode != 0 { - param.AddCode3 = store.JdsStreetCode - } - if updateEntityStoreParam.AddCode == 0 { - param.AddCode3 = store.JdCode - } - //证明这个店可能隶属直辖市或者东莞 - if model.ZXCityCodeMap[store.CityCode] != "" { - result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(store.Lng), jxutils.IntCoordinate2Standard(store.Lat)) - if result["regeocode"] != nil { - street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string) - if street != "" { - result1, _ := api.JdShopAPI.GetProvince() - for _, v := range result1 { - if strings.Contains(store.CityName, v.AreaName) { - result2, _ := api.JdShopAPI.GetCity(v.AreaID) - for _, vv := range result2 { - if strings.Contains(store.DistrictName, vv.AreaName) { - result3, _ := api.JdShopAPI.GetCounty(vv.AreaID) - for _, vvv := range result3 { - if street == vvv.AreaName { - param.AddCode3 = vvv.AreaID - break - } - } - } - } - } - } - } - } - } err = getAPI("2").UpdateBasic(param) } return err