首頁 探索 幫助
註冊 登錄
Kodo
/
kodo
關註 2
讚好 0
派生 0

瀏覽代碼
:art: Update get branch_id

huangqimin001 2 年之前
父節點
ce04f0324b
當前提交
99057eda84
共有 16 個文件被更改，包括 63 次插入 和 63 次删除
顯示文件統計
  1. 3 3
      api/admin_views.py
  2. 1 1
      api/log_views.py
  3. 4 4
      api/maintenance_views.py
  4. 2 2
      api/mch_views.py
  5. 24 24
      api/member_views.py
  6. 2 2
      api/model_views.py
  7. 4 4
      api/staff_views.py
  8. 1 1
      kodo/decorators.py
  9. 2 2
      miniapp/qy_views.py
  10. 6 6
      miniapp/views.py
  11. 1 1
      page/info_views.py
  12. 2 2
      page/oauth_views.py
  13. 3 3
      page/screen_views.py
  14. 2 2
      page/supersr_views.py
  15. 4 4
      sales/views.py
  16. 2 2
      statistic/views.py

+ 3 - 3
api/admin_views.py
查看文件 

@@ -310,7 +310,7 @@ def statistic_daily(request, administrator):
310 310
311 311 
 @check_admin
312 312 
 def statistic_model(request, administrator):
313 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
313 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
314 314 
     admin_id = request.POST.get('admin_id', '')
315 315 
     start_time = request.POST.get('start_time', '')
316 316 
     end_time = request.POST.get('end_time', '')
 
@@ -986,7 +986,7 @@ def member_activity_register_list(request, administrator):
986 986 
 @logit
987 987 
 @check_admin
988 988 
 def member_activity_contribute_list(request, administrator):
989 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
989 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
990 990 
     activity_id = request.POST.get('activity_id', '')
991 991 
     content_type = get_query_value(request, 'content_type', val_cast_type='int')
992 992 
     audit_status = request.POST.get('audit_status', '')
 
@@ -1579,7 +1579,7 @@ def complement_code_list(request, administrator):
1579 1579 
 @check_admin
1580 1580 
 @transaction.atomic
1581 1581 
 def complement_code_audit(request, administrator):
1582 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1582 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
1583 1583 
     admin_id = request.POST.get('admin_id', '')
1584 1584 
     log_id = request.POST.get('log_id', '')
1585 1585 
     audit_status = int(request.POST.get('audit_status', 0))  # -1 审核不通过, 1 审核通过

+ 1 - 1
api/log_views.py
查看文件 

@@ -9,7 +9,7 @@ from logs.models import MchSearchModelAndCameraLogInfo
9 9
10 10 
 @logit
11 11 
 def collect_camera_adaptive_log(request):
12 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
12 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
13 13
14 14 
     user_id = request.POST.get('user_id', '')
15 15 
     is_search_model = int(request.POST.get('is_search_model', 0))

+ 4 - 4
api/maintenance_views.py
查看文件 

@@ -73,7 +73,7 @@ def maintenance_add(request):
73 73
74 74 
 @logit
75 75 
 def maintenance_delete(request):
76 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
76 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
77 77 
     maintenance_id = request.POST.get('maintenance_id', '')
78 78 
     user_id = request.POST.get('user_id', '')
79 79 
 
@@ -93,7 +93,7 @@ def maintenance_delete(request):
93 93
94 94 
 @logit
95 95 
 def maintenance_update(request):
96 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
96 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
97 97 
     maintenance_id = request.POST.get('maintenance_id', '')
98 98 
     admin_id = request.POST.get('admin_id', '')
99 99 
     user_id = request.POST.get('user_id', '')
 
@@ -178,7 +178,7 @@ def maintenance_update(request):
178 178
179 179 
 @logit
180 180 
 def maintenance_list(request):
181 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
181 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
182 182 
     admin_id = request.POST.get('admin_id', '')
183 183 
     user_id = request.POST.get('user_id', '')
184 184 
     page = request.POST.get('page', 1)
 
@@ -396,7 +396,7 @@ def maintenance_tracking_info_callback(request):
396 396
397 397 
 @logit
398 398 
 def maintenance_close(request):
399 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
399 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
400 400 
     maintenance_id = request.POST.get('maintenance_id', '')
401 401 
     admin_id = request.POST.get('admin_id', '')
402 402

+ 2 - 2
api/mch_views.py
查看文件 

@@ -32,7 +32,7 @@ WECHAT = settings.WECHAT
32 32
33 33 
 @logit
34 34 
 def optor_login_api(request):
35 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
35 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
36 36
37 37 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
38 38 
         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
 
@@ -58,7 +58,7 @@ def optor_login_api(request):
58 58
59 59 
 @logit
60 60 
 def admin_login_api(request):
61 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
61 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
62 62
63 63 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
64 64 
         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)

+ 24 - 24
api/member_views.py
查看文件 

@@ -32,7 +32,7 @@ WECHAT = settings.WECHAT
32 32
33 33 
 @logit
34 34 
 def member(request):
35 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
35 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
36 36 
     user_id = request.POST.get('user_id', '')
37 37
38 38 
     # 校验用户是否存在
 
@@ -70,7 +70,7 @@ def member(request):
70 70
71 71 
 @logit
72 72 
 def rights(request):
73 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
73 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
74 74 
     user_id = request.POST.get('user_id', '')
75 75 
     level = request.POST.get('level', '')
76 76 
 
@@ -97,7 +97,7 @@ def rights(request):
97 97
98 98 
 @logit
99 99 
 def right_detail(request):
100 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
100 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
101 101 
     user_id = request.POST.get('user_id', '')
102 102 
     right_id = request.POST.get('right_id', '')
103 103 
 
@@ -113,7 +113,7 @@ def right_detail(request):
113 113
114 114 
 @logit
115 115 
 def goods(request):
116 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
116 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
117 117 
     user_id = request.POST.get('user_id', '')
118 118
119 119 
     # 校验用户是否存在
 
@@ -145,7 +145,7 @@ def goods(request):
145 145
146 146 
 @logit
147 147 
 def good_detail(request):
148 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
148 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
149 149 
     user_id = request.POST.get('user_id', '')
150 150 
     good_id = request.POST.get('good_id', '')
151 151 
 
@@ -175,7 +175,7 @@ def good_detail(request):
175 175 
 @logit
176 176 
 @transaction.atomic
177 177 
 def good_exchange(request):
178 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
178 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
179 179 
     user_id = request.POST.get('user_id', '')
180 180 
     good_id = request.POST.get('good_id', '')
181 181 
     good_ids = get_query_value(request, 'good_ids', val_cast_type='listjson')
 
@@ -263,7 +263,7 @@ def good_exchange(request):
263 263
264 264 
 @logit
265 265 
 def coupons(request):
266 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
266 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
267 267 
     user_id = request.POST.get('user_id', '')
268 268 
     page = request.POST.get('page', 1)
269 269 
     num = request.POST.get('num', 20)
 
@@ -280,7 +280,7 @@ def coupons(request):
280 280
281 281 
 @logit
282 282 
 def user_coupon_detail(request):
283 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
283 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
284 284 
     user_coupon_id = request.POST.get('user_coupon_id', '')
285 285
286 286 
     try:
 
@@ -294,7 +294,7 @@ def user_coupon_detail(request):
294 294 
 @logit
295 295 
 @transaction.atomic
296 296 
 def user_coupon_use(request):
297 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
297 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
298 298 
     admin_id = request.POST.get('admin_id', '')
299 299 
     user_coupon_id = request.POST.get('user_coupon_id', '')
300 300 
 
@@ -322,7 +322,7 @@ def user_coupon_use(request):
322 322
323 323 
 @logit
324 324 
 def integrals(request):
325 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
325 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
326 326
327 327 
     return response(data={
328 328 
         'shots_types': get_member_shot_data(),
 
@@ -343,7 +343,7 @@ def integrals(request):
343 343
344 344 
 @logit
345 345 
 def activity_list(request):
346 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
346 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
347 347 
     user_id = request.POST.get('user_id', '')
348 348
349 349 
     raw_activitys = MemberActivityInfo.objects.filter(activity_state=1, status=True).order_by('-date')
 
@@ -363,7 +363,7 @@ def activity_list(request):
363 363
364 364 
 @logit
365 365 
 def activity_detail(request):
366 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
366 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
367 367 
     user_id = request.POST.get('user_id', '')
368 368 
     activity_id = request.POST.get('activity_id', '')
369 369 
 
@@ -379,7 +379,7 @@ def activity_detail(request):
379 379
380 380 
 @logit
381 381 
 def activity_signup(request):
382 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
382 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
383 383 
     user_id = request.POST.get('user_id', '')
384 384 
     activity_id = request.POST.get('activity_id', '')
385 385 
     avatar = request.POST.get('avatar', '')
 
@@ -410,7 +410,7 @@ def activity_signup(request):
410 410
411 411 
 @logit
412 412 
 def activity_signup_info(request):
413 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
413 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
414 414 
     user_id = request.POST.get('user_id', '')
415 415 
     activity_id = request.POST.get('activity_id', '')
416 416 
 
@@ -433,7 +433,7 @@ def activity_signup_info(request):
433 433 
 @logit
434 434 
 @transaction.atomic
435 435 
 def activity_signin(request):
436 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
436 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
437 437 
     user_id = request.POST.get('user_id', '')
438 438 
     activity_id = request.POST.get('activity_id', '')
439 439 
 
@@ -481,7 +481,7 @@ def get_group_share_info_integral(activity_id, share_user_id, open_gid, group_sh
481 481 
 @logit
482 482 
 @transaction.atomic
483 483 
 def activity_group_share(request):
484 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
484 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
485 485 
     share_user_id = request.POST.get('share_user_id', '')
486 486 
     click_user_id = request.POST.get('click_user_id', '')
487 487 
     activity_id = request.POST.get('activity_id', '')
 
@@ -547,7 +547,7 @@ def activity_group_share(request):
547 547
548 548 
 @logit
549 549 
 def activity_contribute(request):
550 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
550 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
551 551 
     user_id = request.POST.get('user_id', '')
552 552 
     activity_id = request.POST.get('activity_id', '')
553 553 
     content_type = get_query_value(request, 'content_type', val_cast_type='int')
 
@@ -587,7 +587,7 @@ def activity_contribute(request):
587 587
588 588 
 @logit
589 589 
 def activity_contribute_update(request):
590 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
590 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
591 591 
     user_id = request.POST.get('user_id', '')
592 592 
     activity_id = request.POST.get('activity_id', '')
593 593 
     content_type = get_query_value(request, 'content_type', val_cast_type='int')
 
@@ -625,7 +625,7 @@ def activity_contribute_update(request):
625 625
626 626 
 @logit
627 627 
 def activity_contribute_list(request):
628 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
628 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
629 629 
     user_id = request.POST.get('user_id', '')
630 630 
     activity_id = request.POST.get('activity_id', '')
631 631 
     content_type = get_query_value(request, 'content_type', val_cast_type='int')
 
@@ -665,7 +665,7 @@ def activity_contribute_list(request):
665 665
666 666 
 @logit
667 667 
 def activity_contribute_detail(request):
668 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
668 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
669 669 
     contribution_id = request.POST.get('contribution_id', '')
670 670
671 671 
     try:
 
@@ -678,7 +678,7 @@ def activity_contribute_detail(request):
678 678
679 679 
 @logit
680 680 
 def activity_contribute_welfare_unlocking_list(request):
681 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
681 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
682 682 
     user_id = request.POST.get('user_id', '')
683 683 
     page = request.POST.get('page', 1)
684 684 
     num = request.POST.get('num', 20)
 
@@ -695,7 +695,7 @@ def activity_contribute_welfare_unlocking_list(request):
695 695
696 696 
 @logit
697 697 
 def activity_contribute_welfare_unlocking_detail(request):
698 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
698 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
699 699 
     unlocking_id = request.POST.get('unlocking_id', '')
700 700 
     user_id = request.POST.get('user_id', '')
701 701 
 
@@ -713,7 +713,7 @@ def activity_contribute_welfare_unlocking_detail(request):
713 713 
 @logit
714 714 
 @transaction.atomic
715 715 
 def activity_contribute_welfare_unlocking_update(request):
716 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
716 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
717 717 
     unlocking_id = request.POST.get('unlocking_id', '')
718 718 
     user_id = request.POST.get('user_id', '')
719 719 
     name = request.POST.get('name', '')
 
@@ -743,7 +743,7 @@ def activity_contribute_welfare_unlocking_update(request):
743 743 
 @logit
744 744 
 @transaction.atomic
745 745 
 def activity_contribute_welfare_unlocking_handled(request):
746 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
746 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
747 747 
     unlocking_id = request.POST.get('unlocking_id', '')
748 748 
     user_id = request.POST.get('user_id', '')
749 749

+ 2 - 2
api/model_views.py
查看文件 

@@ -145,7 +145,7 @@ def model_list(request):
145 145
146 146 
 @logit
147 147 
 def model_name_list(request):
148 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
148 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
149 149 
     user_id = request.POST.get('user_id', '')
150 150
151 151 
     # 校验用户是否存在
 
@@ -165,7 +165,7 @@ def model_name_list(request):
165 165
166 166 
 @logit
167 167 
 def model_cameras(request):
168 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
168 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
169 169
170 170 
     kw = request.POST.get('kw', '')
171 171 
     page = request.POST.get('page', 1)

+ 4 - 4
api/staff_views.py
查看文件 

@@ -227,7 +227,7 @@ def exec_del_clerk_sale_submit(pk, admin_id):
227 227 
 @logit
228 228 
 @transaction.atomic
229 229 
 def del_clerk_sale_submit_api(request):
230 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
230 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
231 231 
     admin_id = request.POST.get('admin_id', '')
232 232 
     pk = int(request.POST.get('pk', ''))
233 233 
 
@@ -244,7 +244,7 @@ def del_clerk_sale_submit_api(request):
244 244 
 @logit
245 245 
 @transaction.atomic
246 246 
 def batch_del_clerk_sale_submit_api(request):
247 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
247 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
248 248 
     admin_id = request.POST.get('admin_id', '')
249 249 
     pks = json.loads(request.POST.get('pks', []))
250 250 
 
@@ -482,7 +482,7 @@ def exec_del_consumer_submit(pk, admin_id):
482 482 
 @logit
483 483 
 @transaction.atomic
484 484 
 def del_consumer_submit_api(request):
485 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
485 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
486 486 
     admin_id = request.POST.get('admin_id', '')
487 487 
     pk = int(request.POST.get('pk', ''))
488 488 
 
@@ -499,7 +499,7 @@ def del_consumer_submit_api(request):
499 499 
 @logit
500 500 
 @transaction.atomic
501 501 
 def batch_del_consumer_submit_api(request):
502 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
502 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
503 503 
     admin_id = request.POST.get('admin_id', '')
504 504 
     pks = json.loads(request.POST.get('pks', []))
505 505

+ 1 - 1
kodo/decorators.py
查看文件 

@@ -15,7 +15,7 @@ def check_admin(func=None):
15 15 
     def decorator(func):
16 16 
         @wraps(func)
17 17 
         def returned_wrapper(request, *args, **kwargs):
18 
-            brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
18 
+            brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
19 19 
             admin_id = request.POST.get('admin_id', '')
20 20
21 21 
             if brand_id != settings.KODO_DEFAULT_BRAND_ID:

+ 2 - 2
miniapp/qy_views.py
查看文件 

@@ -32,7 +32,7 @@ logger = logging.getLogger('logit')
32 32 
 @logit(res=True)
33 33 
 @transaction.atomic
34 34 
 def qy_login_api(request):
35 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
35 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
36 36 
     appId = request.POST.get('appId', 'QYMINIAPP')
37 37
38 38 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
 
@@ -123,7 +123,7 @@ def qy_login_api(request):
123 123 
 @logit(res=True)
124 124 
 @transaction.atomic
125 125 
 def query_userinfo(request):
126 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
126 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
127 127 
     maintenance_id = request.POST.get('maintenance_id', '')
128 128 
     memebercardcode = request.POST.get('membercardcode', '')
129 129

+ 6 - 6
miniapp/views.py
查看文件 

@@ -29,7 +29,7 @@ logger = logging.getLogger('logit')
29 29 
 @logit
30 30 
 @transaction.atomic
31 31 
 def get_userinfo_api(request):
32 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
32 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
33 33 
     appId = request.POST.get('appId', 'MINIAPP')
34 34
35 35 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
 
@@ -110,7 +110,7 @@ def get_userinfo_api(request):
110 110 
 @logit(res=True)
111 111 
 @transaction.atomic
112 112 
 def mini_login_api(request):
113 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
113 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
114 114 
     appId = request.POST.get('appId', 'MINIAPP')
115 115
116 116 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
 
@@ -204,7 +204,7 @@ def mini_login_api(request):
204 204 
 @logit
205 205 
 @transaction.atomic
206 206 
 def get_userinfo_api2(request):
207 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
207 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
208 208 
     user_id = request.POST.get('user_id', '')
209 209 
     appId = request.POST.get('appId', 'MINIAPP')
210 210 
 
@@ -266,7 +266,7 @@ def get_userinfo_api2(request):
266 266 
 @logit(res=True)
267 267 
 @transaction.atomic
268 268 
 def update_userinfo_api(request):
269 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
269 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
270 270 
     user_id = request.POST.get('user_id', '')
271 271 
     nickname = request.POST.get('nickname', '')
272 272 
     avatar = request.POST.get('avatar', '')
 
@@ -315,7 +315,7 @@ def membercard_extradata(request):
315 315 
 @logit
316 316 
 @transaction.atomic
317 317 
 def user_integral_add(request):
318 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
318 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
319 319 
     user_id = request.POST.get('user_id', '')
320 320 
     integral = int(request.POST.get('integral', 0))
321 321 
     remark = request.POST.get('remark')
 
@@ -346,7 +346,7 @@ def user_integral_add(request):
346 346 
 @logit
347 347 
 @transaction.atomic
348 348 
 def update_user_tenancy_shot_permission(request):
349 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
349 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
350 350 
     user_id = request.POST.get('user_id', '')
351 351 
     tenancy_shot_permission = request.POST.get('tenancy_shot_permission', 0)
352 352

+ 1 - 1
page/info_views.py
查看文件 

@@ -9,7 +9,7 @@ from mch.models import SaleclerkInfo
9 9
10 10
11 11 
 def clerk_info_oauth(request):
12 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
12 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
13 13 
     unionid = request.GET.get('unionid', '')
14 14
15 15 
     try:

+ 2 - 2
page/oauth_views.py
查看文件 

@@ -26,7 +26,7 @@ def login_qrcode(request):
26 26
27 27
28 28 
 def clerk_oauth(request):
29 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
29 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
30 30 
     unionid = request.GET.get('unionid', '')
31 31
32 32 
     try:
 
@@ -54,7 +54,7 @@ def clerk_oauth(request):
54 54 
 @transaction.atomic
55 55 
 def clerk_submit_api(request):
56 56 
     """ 店员授权信息提交 """
57 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
57 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
58 58 
     distributor_id = request.POST.get('distributor_id', '')
59 59 
     unionid = request.POST.get('unionid', '')
60 60 
     openid = request.POST.get('openid', '')

+ 3 - 3
page/screen_views.py
查看文件 

@@ -15,7 +15,7 @@ from utils.redis.rkeys import SCREEN_ADMIN_LOGIN
15 15
16 16 
 @logit
17 17 
 def screen_admin_oauthqr(request):
18 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
18 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
19 19
20 20 
     return json_render(request, 'page/screen_admin_oauth_qrcode.html', unjsondumpsdict={
21 21 
         'qr': settings.KODO_SCREEN_AUTH_URL.format(brand_id)
 
@@ -24,7 +24,7 @@ def screen_admin_oauthqr(request):
24 24
25 25 
 @logit
26 26 
 def screen_admin_oauth(request):
27 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
27 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
28 28 
     unionid = request.GET.get('unionid', '')
29 29 
     openid = request.GET.get('openid', '')
30 30 
 
@@ -52,7 +52,7 @@ def screen_admin_loginqr(request):
52 52
53 53 
 @logit
54 54 
 def screen_admin_login(request):
55 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
55 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
56 56 
     unionid = request.GET.get('unionid', '')
57 57 
     openid = request.GET.get('openid', '')
58 58 
     token = request.GET.get('token', '')

+ 2 - 2
page/supersr_views.py
查看文件 

@@ -9,7 +9,7 @@ from sales.models import SalesResponsibilityInfo
9 9
10 10 
 @logit
11 11 
 def supersr_oauthqr(request):
12 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
12 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
13 13
14 14 
     return json_render(request, 'page/supersr_oauth_qrcode.html', unjsondumpsdict={
15 15 
         'qr': settings.KODO_SUPERSR_AUTH_URL.format(brand_id)
 
@@ -18,7 +18,7 @@ def supersr_oauthqr(request):
18 18
19 19 
 @logit
20 20 
 def supersr_oauth(request):
21 
-    brand_id = request.GET.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
21 
+    brand_id = request.GET.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
22 22 
     unionid = request.GET.get('unionid', '')
23 23
24 24 
     SalesResponsibilityInfo.objects.update_or_create(brand_id=brand_id, unionid=unionid, defaults={

+ 4 - 4
sales/views.py
查看文件 

@@ -16,7 +16,7 @@ from utils.error.errno_utils import SalesResponsibilityStatusCode, UserStatusCod
16 16
17 17 
 @logit
18 18 
 def sr_submit_api(request):
19 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
19 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
20 20 
     user_id = request.POST.get('user_id', '')
21 21 
     name = request.POST.get('name', '')
22 22 
     phone = request.POST.get('phone', '')
 
@@ -44,7 +44,7 @@ def sr_submit_api(request):
44 44
45 45 
 @logit
46 46 
 def sr_distributor_list(request):
47 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
47 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
48 48 
     sr_id = request.POST.get('sr_id', '')
49 49
50 50 
     distributors = DistributorInfo.objects.filter(brand_id=brand_id, sr_id=sr_id, status=True)
 
@@ -57,7 +57,7 @@ def sr_distributor_list(request):
57 57
58 58 
 @logit
59 59 
 def sr_distributor_tj(request):
60 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
60 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
61 61 
     distributor_id = request.POST.get('distributor_id', '')
62 62
63 63 
     sales = SalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, distributor_id=distributor_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-is_important', '-yesterday_num', '-current_month', '-last_month')
 
@@ -83,7 +83,7 @@ def sr_distributor_tj(request):
83 83
84 84 
 @logit
85 85 
 def supersr_sr_tj(request):
86 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
86 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
87 87 
     sr_id = request.POST.get('sr_id', '')
88 88
89 89 
     sales = SuperSalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-yesterday_num', '-current_month', '-last_month')

+ 2 - 2
statistic/views.py
查看文件 

@@ -19,7 +19,7 @@ from utils.rdm_utils import randnum
19 19
20 20 
 @logit
21 21 
 def tj_distributor(request):
22 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
22 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
23 23
24 24 
     ymd = int(tc.local_string(format='%Y%m%d'))
25 25 
 
@@ -73,7 +73,7 @@ def tj_distributor(request):
73 73
74 74 
 @logit
75 75 
 def tj_consumer(request):
76 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
76 
+    brand_id = request.POST.get('brand_id') or settings.KODO_DEFAULT_BRAND_ID
77 77
78 78 
     ymd = int(tc.local_string(format='%Y%m%d'))
79 79