1241
log = GoodsInfo.objects.get(good_id=good_id, status=True)
|
|
1622
|
1242
|
except GoodsInfo.DoesNotExist:
|
|
|
|
@@ -1636,9 +1256,8 @@ def member_goods_update(request):
|
|
1636
|
1256
|
return response(200, 'GoodsInfo Update Success', u'积分商品更新成功')
|
|
1637
|
1257
|
|
|
1638
|
1258
|
|
|
1639
|
|
-def member_goods_create(request):
|
|
1640
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1641
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
|
1259
|
+@check_admin
|
|
|
1260
|
+def member_goods_create(request, administrator):
|
|
1642
|
1261
|
good_type = int(request.POST.get('good_type', 0))
|
|
1643
|
1262
|
title = request.POST.get('title', '')
|
|
1644
|
1263
|
desc = request.POST.get('desc', '')
|
|
|
|
@@ -1650,14 +1269,6 @@ def member_goods_create(request):
|
|
1650
|
1269
|
integral = int(request.POST.get('integral', 0))
|
|
1651
|
1270
|
fee = int(request.POST.get('fee', 0))
|
|
1652
|
1271
|
|
|
1653
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1654
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1655
|
|
-
|
|
1656
|
|
- try:
|
|
1657
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1658
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1659
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1660
|
|
-
|
|
1661
|
1272
|
GoodsInfo.objects.create(
|
|
1662
|
1273
|
brand_id=administrator.brand_id,
|
|
1663
|
1274
|
good_type=good_type,
|
|
|
|
@@ -1675,23 +1286,14 @@ def member_goods_create(request):
|
|
1675
|
1286
|
return response(200, 'GoodsInfo Create Success', u'积分商品创建成功')
|
|
1676
|
1287
|
|
|
1677
|
1288
|
|
|
1678
|
|
-def complement_code_list(request):
|
|
1679
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1680
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
1681
|
|
- page = request.POST.get('page', 1)
|
|
1682
|
|
- num = request.POST.get('num', 20)
|
|
|
1289
|
+@check_admin
|
|
|
1290
|
+def complement_code_list(request, administrator):
|
|
1683
|
1291
|
start_time = request.POST.get('start_time', '')
|
|
1684
|
1292
|
end_time = request.POST.get('end_time', '')
|
|
1685
|
1293
|
type_ = request.POST.get('type', '')
|
|
1686
|
1294
|
query = request.POST.get('query', '')
|
|
1687
|
|
-
|
|
1688
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1689
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1690
|
|
-
|
|
1691
|
|
- try:
|
|
1692
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1693
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1694
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
|
1295
|
+ page = request.POST.get('page', 1)
|
|
|
1296
|
+ num = request.POST.get('num', 20)
|
|
1695
|
1297
|
|
|
1696
|
1298
|
logs = ComplementCodeLogInfo.objects.filter(status=True)
|
|
1697
|
1299
|
|
|
|
|
@@ -1723,21 +1325,14 @@ def complement_code_list(request):
|
|
1723
|
1325
|
})
|
|
1724
|
1326
|
|
|
1725
|
1327
|
|
|
|
1328
|
+@check_admin
|
|
1726
|
1329
|
@transaction.atomic
|
|
1727
|
|
-def complement_code_audit(request):
|
|
|
1330
|
+def complement_code_audit(request, administrator):
|
|
1728
|
1331
|
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1729
|
1332
|
admin_id = request.POST.get('admin_id', '')
|
|
1730
|
1333
|
log_id = request.POST.get('log_id', '')
|
|
1731
|
1334
|
audit_status = int(request.POST.get('audit_status', 0)) # -1 审核不通过, 1 审核通过
|
|
1732
|
1335
|
|
|
1733
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1734
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1735
|
|
-
|
|
1736
|
|
- try:
|
|
1737
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1738
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1739
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1740
|
|
-
|
|
1741
|
1336
|
if audit_status not in [ComplementCodeLogInfo.AUDIT_REFUSED, ComplementCodeLogInfo.AUDIT_PASS]:
|
|
1742
|
1337
|
return response(ComplementCodeStatusCode.COMPLEMENT_CODE_STATUS_INVALID)
|
|
1743
|
1338
|
|
|
|
|
@@ -1820,21 +1415,12 @@ def complement_code_audit(request):
|
|
1820
|
1415
|
return response()
|
|
1821
|
1416
|
|
|
1822
|
1417
|
|
|
|
1418
|
+@check_admin
|
|
1823
|
1419
|
@transaction.atomic
|
|
1824
|
|
-def complement_code_contacted(request):
|
|
1825
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1826
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
|
1420
|
+def complement_code_contacted(request, administrator):
|
|
1827
|
1421
|
log_id = request.POST.get('log_id', '')
|
|
1828
|
1422
|
is_contacted = int(request.POST.get('is_contacted', 0)) # 0 未联系, 1 已联系
|
|
1829
|
1423
|
|
|
1830
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1831
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1832
|
|
-
|
|
1833
|
|
- try:
|
|
1834
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1835
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1836
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1837
|
|
-
|
|
1838
|
1424
|
try:
|
|
1839
|
1425
|
log = ComplementCodeLogInfo.objects.select_for_update().get(log_id=log_id, status=True)
|
|
1840
|
1426
|
except ComplementCodeLogInfo.DoesNotExist:
|
|
|
|
@@ -1846,20 +1432,11 @@ def complement_code_contacted(request):
|
|
1846
|
1432
|
return response()
|
|
1847
|
1433
|
|
|
1848
|
1434
|
|
|
1849
|
|
-def administrator_list(request):
|
|
1850
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1851
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
|
1435
|
+@check_admin
|
|
|
1436
|
+def administrator_list(request, administrator):
|
|
1852
|
1437
|
page = request.POST.get('page', 1)
|
|
1853
|
1438
|
num = request.POST.get('num', 20)
|
|
1854
|
1439
|
|
|
1855
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1856
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1857
|
|
-
|
|
1858
|
|
- try:
|
|
1859
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1860
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1861
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1862
|
|
-
|
|
1863
|
1440
|
if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
|
|
1864
|
1441
|
return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
|
|
1865
|
1442
|
|
|
|
|
@@ -1868,6 +1445,7 @@ def administrator_list(request):
|
|
1868
|
1445
|
count = logs.count()
|
|
1869
|
1446
|
logs, left = pagination(logs, page, num)
|
|
1870
|
1447
|
logs = [log.admindata for log in logs]
|
|
|
1448
|
+
|
|
1871
|
1449
|
return response(200, 'Get Admin List Success', u'获取后台管理员成功', data={
|
|
1872
|
1450
|
'logs': logs,
|
|
1873
|
1451
|
'left': left,
|
|
|
|
@@ -1875,31 +1453,21 @@ def administrator_list(request):
|
|
1875
|
1453
|
})
|
|
1876
|
1454
|
|
|
1877
|
1455
|
|
|
1878
|
|
-def administrator_create(request):
|
|
1879
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1880
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
1881
|
|
-
|
|
|
1456
|
+@check_admin
|
|
|
1457
|
+def administrator_create(request, administrator):
|
|
1882
|
1458
|
admin_type = request.POST.get('admin_type', '')
|
|
1883
|
1459
|
phone = request.POST.get('phone', '')
|
|
1884
|
1460
|
name = request.POST.get('name', '')
|
|
1885
|
1461
|
password = request.POST.get('password', '')
|
|
1886
|
1462
|
brand_name = request.POST.get('brand_name', '')
|
|
1887
|
1463
|
|
|
1888
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1889
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1890
|
|
-
|
|
1891
|
|
- try:
|
|
1892
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1893
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1894
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1895
|
|
-
|
|
1896
|
1464
|
if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
|
|
1897
|
1465
|
return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
|
|
1898
|
1466
|
|
|
1899
|
1467
|
encryption = make_password(strip(password), settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)
|
|
1900
|
1468
|
|
|
1901
|
1469
|
AdministratorInfo.objects.create(
|
|
1902
|
|
- brand_id=brand_id,
|
|
|
1470
|
+ brand_id=administrator.brand_id,
|
|
1903
|
1471
|
brand_name=brand_name,
|
|
1904
|
1472
|
admin_type=admin_type,
|
|
1905
|
1473
|
phone=phone,
|
|
|
|
@@ -1911,24 +1479,14 @@ def administrator_create(request):
|
|
1911
|
1479
|
return response(200, 'Create Admin Success', u'创建后台管理员成功')
|
|
1912
|
1480
|
|
|
1913
|
1481
|
|
|
1914
|
|
-def administrator_update(request):
|
|
1915
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1916
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
1917
|
|
-
|
|
|
1482
|
+@check_admin
|
|
|
1483
|
+def administrator_update(request, administrator):
|
|
1918
|
1484
|
target_admin_id = request.POST.get('target_admin_id', '')
|
|
1919
|
1485
|
admin_type = int(request.POST.get('admin_type', -1))
|
|
1920
|
1486
|
phone = request.POST.get('phone', '')
|
|
1921
|
1487
|
name = request.POST.get('name', '')
|
|
1922
|
1488
|
password = request.POST.get('password', '')
|
|
1923
|
1489
|
|
|
1924
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1925
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1926
|
|
-
|
|
1927
|
|
- try:
|
|
1928
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1929
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1930
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1931
|
|
-
|
|
1932
|
1490
|
if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
|
|
1933
|
1491
|
return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
|
|
1934
|
1492
|
|
|
|
|
@@ -1953,19 +1511,10 @@ def administrator_update(request):
|
|
1953
|
1511
|
return response(200, 'Update Admin Success', u'更新后台管理员成功')
|
|
1954
|
1512
|
|
|
1955
|
1513
|
|
|
1956
|
|
-def administrator_delete(request):
|
|
1957
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1958
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
|
1514
|
+@check_admin
|
|
|
1515
|
+def administrator_delete(request, administrator):
|
|
1959
|
1516
|
target_admin_id = request.POST.get('target_admin_id', '')
|
|
1960
|
1517
|
|
|
1961
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1962
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1963
|
|
-
|
|
1964
|
|
- try:
|
|
1965
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1966
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1967
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1968
|
|
-
|
|
1969
|
1518
|
if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
|
|
1970
|
1519
|
return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
|
|
1971
|
1520
|
|
|
|
|
@@ -1974,21 +1523,12 @@ def administrator_delete(request):
|
|
1974
|
1523
|
return response(200, 'Delete Admin Success', u'删除后台管理员成功')
|
|
1975
|
1524
|
|
|
1976
|
1525
|
|
|
1977
|
|
-def administrator_login_list(request):
|
|
1978
|
|
- brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
1979
|
|
- admin_id = request.POST.get('admin_id', '')
|
|
|
1526
|
+@check_admin
|
|
|
1527
|
+def administrator_login_list(request, administrator):
|
|
1980
|
1528
|
page = request.POST.get('page', 1)
|
|
1981
|
1529
|
num = request.POST.get('num', 20)
|
|
1982
|
1530
|
target_admin_id = request.POST.get('target_admin_id', '')
|
|
1983
|
1531
|
|
|
1984
|
|
- if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
1985
|
|
- return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
1986
|
|
-
|
|
1987
|
|
- try:
|
|
1988
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
1989
|
|
- except AdministratorInfo.DoesNotExist:
|
|
1990
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
1991
|
|
-
|
|
1992
|
1532
|
if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
|
|
1993
|
1533
|
return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
|
|
1994
|
1534
|
|
|
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+# -*- coding: utf-8 -*-
|
|
|
2
|
+
|
|
|
3
|
+from __future__ import division
|
|
|
4
|
+
|
|
|
5
|
+from functools import wraps
|
|
|
6
|
+
|
|
|
7
|
+from django.conf import settings
|
|
|
8
|
+from django_response import response
|
|
|
9
|
+
|
|
|
10
|
+from mch.models import AdministratorInfo
|
|
|
11
|
+from utils.error.errno_utils import AdministratorStatusCode, ProductBrandStatusCode
|
|
|
12
|
+
|
|
|
13
|
+
|
|
|
14
|
+def check_admin(func=None):
|
|
|
15
|
+ def decorator(func):
|
|
|
16
|
+ @wraps(func)
|
|
|
17
|
+ def returned_wrapper(request, *args, **kwargs):
|
|
|
18
|
+ brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
|
|
19
|
+ admin_id = request.POST.get('admin_id', '')
|
|
|
20
|
+
|
|
|
21
|
+ if brand_id != settings.KODO_DEFAULT_BRAND_ID:
|
|
|
22
|
+ return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
|
|
|
23
|
+
|
|
|
24
|
+ try:
|
|
|
25
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
|
26
|
+ except AdministratorInfo.DoesNotExist:
|
|
|
27
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
|
28
|
+
|
|
|
29
|
+ return func(request, administrator=administrator, *args, **kwargs)
|
|
|
30
|
+
|
|
|
31
|
+ return returned_wrapper
|
|
|
32
|
+
|
|
|
33
|
+ if not func:
|
|
|
34
|
+ def foo(func):
|
|
|
35
|
+ return decorator(func)
|
|
|
36
|
+
|
|
|
37
|
+ return foo
|
|
|
38
|
+
|
|
|
39
|
+ return decorator(func)
|