api/mch_views.py

@@ -433,6 +433,7 @@ def consumer_info_api(request):

                             'ymd': ymd,
              

                             'serialNo': serialNo,
              

                             'model_id': model.model_id,
              

                +            'pk': log.pk,
              

                         })
              

                 
              

                     if not dupload:
              

commands/management/commands/gis.py

@@ -41,42 +41,28 @@ class Command(CompatibilityBaseCommand):

                 
              

                                 with transaction.atomic():
              

                                     try:
              

                -                        gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0))).json()
              

                +                        gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0)), verify=False).json()
              

                                     except Exception as e:
              

                                         logger.info(e.message)
              

                 
              

                -                    zh1 = gisinfo.get('data', {}).get('zh1', '')
              

                +                    zh1 = gisinfo.get('result', {}).get('address_component', {}).get('province', '')
              

                 
              

                                     province_code = ProvinceModelMixin.PROVINCE_NAME_CODE_DICT.get(zh1) if zh1 else ''
              

                 
              

                -                    # 手机归属地
              

                -                    if not province_code:
              

                -                        try:
              

                -                            phoneinfo = requests.get(settings.PHONE_2_ADMINISTRATIVE_DIVISION.format(v.get('phone', 0)))
              

                -                        except Exception as e:
              

                -                            logger.info(e.message)
              

                -                            continue
              

                -                        try:
              

                -                            province_name = json.loads(phoneinfo.content.split('(')[-1][:-1])['data']['area']
              

                -                        except Exception as e:
              

                -                            logger.info(e.message)
              

                -                            continue
              

                -                        province_code = ProvinceShortModelMixin.PROVINCE_NAME_CODE_DICT.get(province_name)
              

                -
              

                                     if not province_code:
              

                                         continue
              

                 
              

                                     brand_id = v.get('brand_id', '')
              

                                     user_id = v.get('user_id', '')
              

                -                    ymd = v.get('ymd', '')
              

                +                    ymd = str(v.get('ymd', ''))
              

                 
              

                                     # 更新用户表
              

                                     user = UserInfo.objects.get(user_id=user_id, status=True)
              

                                     user.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
              

                                     user.save()
              

                 
              

                -                    if v.get('model_id'):
              

                -                        log = ConsumeInfoSubmitLogInfo.objects.get(model_id=v.get('model_id', ''), serialNo=v.get('serialNo', ''), status=True)
              

                +                    if v.get('pk'):
              

                +                        log = ConsumeInfoSubmitLogInfo.objects.get(pk=v.get('pk', -1), status=True)
              

                                         log.province = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
              

                                         log.save()
              

                 
              

kodo/settings.py

@@ -428,7 +428,7 @@ KODO_DEFAULT_BRAND_NAME = ''

                 KODO_DEFAULT_BRAND_DOMAIN = ''
              

                 
              

                 # 经纬度
              

                -GIS_2_ADMINISTRATIVE_DIVISION = 'http://116.196.105.215:1234/gis?auth_user=freevip&latitude={0}&longitude={1}'
              

                +GIS_2_ADMINISTRATIVE_DIVISION = 'https://apis.map.qq.com/ws/geocoder/v1/?key=4FNBZ-TIIKW-MWJRQ-RHZJN-W6F7Q-BFBKX&location={0},{1}'
              

                 PHONE_2_ADMINISTRATIVE_DIVISION = 'https://www.baifubao.com/callback?cmd=1059&callback=phone&phone={0}'
              

                 
              

                 TESTING_SNS = ['000000']
              

pre/views.py

@@ -331,7 +331,8 @@ def refreshs():

                                 'phone': log.phone,
              

                                 'ymd': tc.local_string(utc_dt=log.created_at, format='%Y%m%d'),
              

                                 'model_id': log.model_id,
              

                -                'serialNo': log.serialNo
              

                +                'serialNo': log.serialNo,
              

                +                'pk': log.pk,
              

                             })