">91 
-
92 
-                        try:
93 
-                            coupon = CouponInfo.objects.get(coupon_id=coupon_id)
94 
-                        except CouponInfo.DoesNotExist:
95 
-                            continue
96 
-
97 
-                        for _ in range(right.coupon_num or coupon_num):
98 
-                            UserCouponInfo.objects.create(
99 
-                                brand_id=coupon.brand_id,
100 
-                                brand_name=coupon.brand_name,
101 
-                                coupon_id=coupon_id,
102 
-                                user_id=user_id,
103 
-                                coupon_title=coupon.coupon_title,
104 
-                                coupon_detail=coupon.coupon_detail,
105 
-                                coupon_value=coupon.coupon_value,
106 
-                                coupon_image=coupon.coupon_image,
107 
-                                active_at=tc.utc_datetime(),
108 
-                                expire_at=tc.utc_datetime(days=365),
109 
-                                coupon_valid_period=coupon.coupon_valid_period,
110 
-                                coupon_limit_model_ids=coupon.coupon_limit_model_ids,
111 
-                            )
112 
-
113 
-                close_old_connections()
99 
+                    for _ in range(right.coupon_num or coupon_num):
100 
+                        UserCouponInfo.objects.create(
101 
+                            brand_id=coupon.brand_id,
102 
+                            brand_name=coupon.brand_name,
103 
+                            coupon_id=coupon_id,
104 
+                            user_id=user_id,
105 
+                            coupon_title=coupon.coupon_title,
106 
+                            coupon_detail=coupon.coupon_detail,
107 
+                            coupon_value=coupon.coupon_value,
108 
+                            coupon_image=coupon.coupon_image,
109 
+                            active_at=tc.utc_datetime(),
110 
+                            expire_at=tc.utc_datetime(days=365),
111 
+                            coupon_valid_period=coupon.coupon_valid_period,
112 
+                            coupon_limit_model_ids=coupon.coupon_limit_model_ids,
113 
+                        )
114 
+
115 
+            close_old_connections()

+ 74 - 73
commands/management/commands/gis.py
Bestand weergeven 

@@ -1,6 +1,5 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
-import json
4 3 
 import logging
5 4
6 5 
 import requests
 
@@ -33,75 +32,77 @@ class Command(CompatibilityBaseCommand):
33 32 
             #     'ymd': '20121212',
34 33 
             # })
35 34 
             k, v = r.blpopjson(MINI_PROGRAM_GIS_LIST, 60)
36 
-            if v:
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()

+ 1 - 0
commands/management/commands/membercard.py
Bestand weergeven 

@@ -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

+ 1 - 0
commands/management/commands/qiniu.py
Bestand weergeven 

@@ -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

update jswe.js · 48c5514e05 - Gogs: Go Git Service
Начало Разгледай Помощ
Регистриране Влизане
Pai2
/
pai2
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
update jswe.js

Brightcells преди 9 години
родител
c81acc73e4
ревизия
48c5514e05
променени са 1 файла, в които са добавени 8 реда и са изтрити 5 реда
Покажи статистика за разликите
  1. 8 5
      pai2/static/pai2/js/jswe.js

+ 8 - 5
pai2/static/pai2/js/jswe.js
Преглед на файла 

@@ -1,6 +1,7 @@
1 1 
 !(function(e, t) {
2 2 
     var config = {
3 
-        wxconfig: 'http://api.pai.ai/wx/jsapi_signature'
3 
+        wxconfig: 'http://api.pai.ai/wx/jsapi_signature',
4 
+        callback: 'callback'
4 5 
     }, wxData = {
5 6 
         debug: false,
6 7 
         imgUrl: '',
 
@@ -86,6 +87,7 @@
86 87 
     }
87 88
88 89 
     function wxReady(data) {
90 
+        data = typeof data === 'object' ? data : JSON.parse(data)
89 91 
         wx.config({
90 92 
             debug: wxData.debug,
91 93 
             appId: data.appId,
 
@@ -148,11 +150,12 @@
148 150 
     }
149 151
150 152 
     if (isOpenInWeixin() || isOpenOnPC()) {
153 
+        if ('undefined' !== typeof JSWE_CONF_UPDATE) JSWE_CONF_UPDATE(config)
151 154 
         $.ajax({
152 155 
             url: config.wxconfig,
153 156 
             type: 'get',
154 157 
             dataType: 'jsonp',
155 
-            jsonpCallback: 'callback',
158 
+            jsonpCallback: config.callback,
156 159 
             data: {
157 160 
                 url: window.location.href.split('#')[0]
158 161 
             },
 
@@ -166,7 +169,7 @@
166 169 
     }
167 170
168 171 
     function changeWxData(key, value, flag) {
169 
-        if (key in falDwxDataata) wxData[key] = value
172 
+        if (key in falDwxDataata) {wxData[key] = value}
170 173 
         if (flag) fixedWxData()
171 174 
     }
172 175 
 
@@ -175,7 +178,7 @@
175 178 
     }
176 179
177 180 
     var v = {
178 
-        version: '1.0.0',
181 
+        version: '1.0.5',
179 182
180 183 
         // Basic Vars
181 184 
         config: config,
 
@@ -198,4 +201,4 @@
198 201 
         fixedWxData: fixedWxData
199 202 
     }
200 203 
     e.JSWE = e.V = v
201 
-})(window)
204 
+})(window)