修改逆地理位置接口服务商：由百度改为天地图，修改怀庄酒页面进入逻辑

wx/views.py

@@ -320,8 +320,7 @@ def get_activity(company_id,label_code,lng=0,lat=0,phone='',activity_id=0):
         city = ''
         district=''
         if lng and lat:
-            lng_lat = gcj02_to_bd09(lng, lat)
-            adr = getAddressInfoByBaiDuApi(lng_lat)
+            adr = getAddressInfoByBaiDuApi([lng,lat])
             city = adr['city']
             district = adr['district']
         if (city =='吕梁市' and (district == '柳林县' or district == '吴堡县')) or city =='榆林市':
@@ -2519,8 +2518,9 @@ def wx_label_scan(request,company_id,app_id=None):
         ck=request.COOKIES.get(WX_CK_UID+'_'+company_id+"_"+app_id, '')
         #response.set_cookie(WX_CK_UID+'_'+company_id+"_"+app_id,encrypt_p(consumer_id), expires=datetime.datetime.now()+datetime.timedelta(days=7))  
     
-    if company_id == "107196":
+    if company_id == "107196" or company_id == "162434":
         response = render(request, 'label_scan/' + company_id+ '/index.html')
+        response.set_cookie('package', package, max_age=3600)  
         response.set_cookie('label_code', label_code, max_age=3600)
         return response
 
@@ -4646,8 +4646,7 @@ def nc_labelScan(request):
     city = ""
     address = ""
     if lng and lat:
-        lng_lat = gcj02_to_bd09(float(lng), float(lat))
-        adr = getAddressInfoByBaiDuApi(lng_lat)
+        adr = getAddressInfoByBaiDuApi([float(lng), float(lat)])
         province = adr['province']
         city = adr['city']
         address = adr['address'] +' '+ adr['desc']
@@ -5153,8 +5152,7 @@ def wx_label_scan_record(request):
     district = ""
     lng_lat = [lng, lat]
     if lng and lat:
-        lng_lat = gcj02_to_bd09(float(lng), float(lat))
-        adr = getAddressInfoByBaiDuApi(lng_lat)
+        adr = getAddressInfoByBaiDuApi([float(lng), float(lat)])
         province = adr['province']
         city = adr['city']
         district = adr['district']
@@ -10321,20 +10319,15 @@ def getAddressInfoByBaiDuApi(lng_lat):
         'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36 QIHU 360SE'
     }
     if lng_lat:
-        #url_base = "https://api.map.baidu.com/geocoder/v2/?ak=ASl2xmUaYpjwdWy3GPBQbpUK"
-        #url_base = "https://api.map.baidu.com/reverse_geocoding/v3/?ak=vucsxFygWw4XNTyythrcIP4PkogHhZ9D&coordtype=wgs84ll"
-        url_base = "https://api.map.baidu.com/reverse_geocoding/v3/?ak=TzSrPO5pkx7tt36nIfZwtUzRMgomAor6&coordtype=wgs84ll"
-        #url_base = "https://api.map.baidu.com/reverse_geocoding/v3/?ak=QSVVHpVmZM381bd5nXDCfyevn63acGq4&coordtype=wgs84ll"
-        url = url_base + "&location=" + str(lng_lat[1]) + "," + str(lng_lat[0]) + "&output=json&extensions_poi=1"
+        url = "http://api.tianditu.gov.cn/geocoder?postStr={'lon':"+ lng_lat[0] + ",'lat':"+ lng_lat[1] + ",'ver':1}&type=geocode&tk=53bdaea0d9209e73eaf3f1efcb1db194"
         location_result = requests.get(url, headers=headers)
         p = json.loads(location_result.text)
-        #print(p)
         if p["status"] == 0:
             data['province'] = p['result']['addressComponent']['province']
             data['city'] = p['result']['addressComponent']['city']
-            data['district'] = p["result"]["addressComponent"]["district"]
+            data['district'] = p["result"]["addressComponent"]["county"]
             data['address'] = p['result']['formatted_address']
-            data['desc'] = p['result']['sematic_description']
+            data['desc'] = ''
     return data
 
 #2022-06-08
@@ -10445,8 +10438,7 @@ def fakelabel(request,company_id):
         lng_lat=[] 
         
     if lng_lat:
-        lng_lat = gcj02_to_bd09(float(lng_lat[0]), float(lng_lat[1]))
-        adr = getAddressInfoByBaiDuApi(lng_lat)
+        adr = getAddressInfoByBaiDuApi([float(lng_lat[0]), float(lng_lat[1])])
         #解析地理位置
         province = adr['province']
         city = adr['city']