|
37
|
|
-
|
|
38
|
|
- close_old_connections()
|
|
39
|
|
-
|
|
40
|
|
- logger.info(v)
|
|
41
|
|
-
|
|
42
|
|
- with transaction.atomic():
|
|
43
|
|
- try:
|
|
44
|
|
- gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0)), verify=False).json()
|
|
45
|
|
- except Exception as e:
|
|
46
|
|
- logger.info(e.message)
|
|
47
|
|
-
|
|
48
|
|
- zh1 = gisinfo.get('result', {}).get('address_component', {}).get('province', '')
|
|
49
|
|
-
|
|
50
|
|
- province_code = ProvinceModelMixin.PROVINCE_NAME_CODE_DICT.get(zh1) if zh1 else ''
|
|
51
|
|
-
|
|
52
|
|
- if not province_code:
|
|
53
|
|
- continue
|
|
54
|
|
-
|
|
55
|
|
- brand_id = v.get('brand_id', '')
|
|
56
|
|
- user_id = v.get('user_id', '')
|
|
57
|
|
- ymd = str(v.get('ymd', ''))
|
|
58
|
|
-
|
|
59
|
|
- # 更新用户表
|
|
60
|
|
- user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
|
|
61
|
|
- user.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
62
|
|
- user.save()
|
|
63
|
|
-
|
|
64
|
|
- if v.get('pk'):
|
|
65
|
|
- log = ConsumeInfoSubmitLogInfo.objects.get(pk=v.get('pk', -1), status=True)
|
|
66
|
|
- log.province = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
67
|
|
- log.save()
|
|
68
|
|
-
|
|
69
|
|
- # [消费者维度]省份销量统计
|
|
70
|
|
- # 日
|
|
71
|
|
- cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
72
|
|
- brand_id=brand_id,
|
|
73
|
|
- province_code=province_code,
|
|
74
|
|
- ymd=ymd,
|
|
75
|
|
- )
|
|
76
|
|
- if not cpssi.province_name:
|
|
77
|
|
- cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
78
|
|
- cpssi.users = list(set(cpssi.users + [user_id]))
|
|
79
|
|
- cpssi.num = len(cpssi.users)
|
|
80
|
|
- cpssi.num2 += 1
|
|
81
|
|
- cpssi.save()
|
|
82
|
|
- # 月
|
|
83
|
|
- cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
84
|
|
- brand_id=brand_id,
|
|
85
|
|
- province_code=province_code,
|
|
86
|
|
- ymd=ymd[:6],
|
|
87
|
|
- )
|
|
88
|
|
- if not cpssi.province_name:
|
|
89
|
|
- cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
90
|
|
- cpssi.users = list(set(cpssi.users + [user_id]))
|
|
91
|
|
- cpssi.num = len(cpssi.users)
|
|
92
|
|
- cpssi.num2 += 1
|
|
93
|
|
- cpssi.save()
|
|
94
|
|
- # 年
|
|
95
|
|
- cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
96
|
|
- brand_id=brand_id,
|
|
97
|
|
- province_code=province_code,
|
|
98
|
|
- ymd=ymd[:4],
|
|
99
|
|
- )
|
|
100
|
|
- if not cpssi.province_name:
|
|
101
|
|
- cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
102
|
|
- cpssi.users = list(set(cpssi.users + [user_id]))
|
|
103
|
|
- cpssi.num = len(cpssi.users)
|
|
104
|
|
- cpssi.num2 += 1
|
|
105
|
|
- cpssi.save()
|
|
106
|
|
-
|
|
107
|
|
- close_old_connections()
|
|
|
35
|
+
|
|
|
36
|
+ if not v:
|
|
|
37
|
+ continue
|
|
|
38
|
+
|
|
|
39
|
+ close_old_connections()
|
|
|
40
|
+
|
|
|
41
|
+ logger.info(v)
|
|
|
42
|
+
|
|
|
43
|
+ with transaction.atomic():
|
|
|
44
|
+ try:
|
|
|
45
|
+ gisinfo = requests.get(settings.GIS_2_ADMINISTRATIVE_DIVISION.format(v.get('lat', 0), v.get('lon', 0)), verify=False).json()
|
|
|
46
|
+ except Exception as e:
|
|
|
47
|
+ logger.info(e.message)
|
|
|
48
|
+
|
|
|
49
|
+ zh1 = gisinfo.get('result', {}).get('address_component', {}).get('province', '')
|
|
|
50
|
+
|
|
|
51
|
+ province_code = ProvinceModelMixin.PROVINCE_NAME_CODE_DICT.get(zh1) if zh1 else ''
|
|
|
52
|
+
|
|
|
53
|
+ if not province_code:
|
|
|
54
|
+ continue
|
|
|
55
|
+
|
|
|
56
|
+ brand_id = v.get('brand_id', '')
|
|
|
57
|
+ user_id = v.get('user_id', '')
|
|
|
58
|
+ ymd = str(v.get('ymd', ''))
|
|
|
59
|
+
|
|
|
60
|
+ # 更新用户表
|
|
|
61
|
+ user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
|
|
|
62
|
+ user.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
|
63
|
+ user.save()
|
|
|
64
|
+
|
|
|
65
|
+ if v.get('pk'):
|
|
|
66
|
+ log = ConsumeInfoSubmitLogInfo.objects.get(pk=v.get('pk', -1), status=True)
|
|
|
67
|
+ log.province = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
|
68
|
+ log.save()
|
|
|
69
|
+
|
|
|
70
|
+ # [消费者维度]省份销量统计
|
|
|
71
|
+ # 日
|
|
|
72
|
+ cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
|
73
|
+ brand_id=brand_id,
|
|
|
74
|
+ province_code=province_code,
|
|
|
75
|
+ ymd=ymd,
|
|
|
76
|
+ )
|
|
|
77
|
+ if not cpssi.province_name:
|
|
|
78
|
+ cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
|
79
|
+ cpssi.users = list(set(cpssi.users + [user_id]))
|
|
|
80
|
+ cpssi.num = len(cpssi.users)
|
|
|
81
|
+ cpssi.num2 += 1
|
|
|
82
|
+ cpssi.save()
|
|
|
83
|
+ # 月
|
|
|
84
|
+ cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
|
85
|
+ brand_id=brand_id,
|
|
|
86
|
+ province_code=province_code,
|
|
|
87
|
+ ymd=ymd[:6],
|
|
|
88
|
+ )
|
|
|
89
|
+ if not cpssi.province_name:
|
|
|
90
|
+ cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
|
91
|
+ cpssi.users = list(set(cpssi.users + [user_id]))
|
|
|
92
|
+ cpssi.num = len(cpssi.users)
|
|
|
93
|
+ cpssi.num2 += 1
|
|
|
94
|
+ cpssi.save()
|
|
|
95
|
+ # 年
|
|
|
96
|
+ cpssi, _ = ConsumeProvinceSaleStatisticInfo.objects.select_for_update().get_or_create(
|
|
|
97
|
+ brand_id=brand_id,
|
|
|
98
|
+ province_code=province_code,
|
|
|
99
|
+ ymd=ymd[:4],
|
|
|
100
|
+ )
|
|
|
101
|
+ if not cpssi.province_name:
|
|
|
102
|
+ cpssi.province_name = ProvinceShortModelMixin.PROVINCE_CODE_NAME_DICT.get(province_code)
|
|
|
103
|
+ cpssi.users = list(set(cpssi.users + [user_id]))
|
|
|
104
|
+ cpssi.num = len(cpssi.users)
|
|
|
105
|
+ cpssi.num2 += 1
|
|
|
106
|
+ cpssi.save()
|
|
|
107
|
+
|
|
|
108
|
+ close_old_connections()
|
|
|
|
@@ -43,6 +43,7 @@ class Command(CompatibilityBaseCommand):
|
|
43
|
43
|
# 'code': 'code',
|
|
44
|
44
|
# })
|
|
45
|
45
|
k, v = r.blpopjson(MEMBERCARD_USERINFO_LIST, 60)
|
|
|
46
|
+
|
|
46
|
47
|
if not v:
|
|
47
|
48
|
continue
|
|
48
|
49
|
|
|
|
|
@@ -25,6 +25,7 @@ class Command(CompatibilityBaseCommand):
|
|
25
|
25
|
# 'pk': 'pk',
|
|
26
|
26
|
# })
|
|
27
|
27
|
k, v = r.blpopjson(QINIU_UPLOAD_LIST, 60)
|
|
|
28
|
+
|
|
28
|
29
|
if not v:
|
|
29
|
30
|
continue
|
|
30
|
31
|
|