首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0

浏览代码
Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron

FFIB 3 年之前
父节点
f34127c9d1 1382af2bdf
当前提交
4b13c918a4
共有 7 个文件被更改，包括 378 次插入 和 555 次删除
显示文件统计
  1. 210 549
      api/admin_views.py
  2. 8 3
      api/urls.py
  3. 39 0
      kodo/decorators.py
  4. 9 3
      member/admin.py
  5. 43 0
      member/migrations/0038_auto_20221025_0141.py
  6. 19 0
      member/migrations/0039_memberactivitycontributionwelfareinfo_is_upload_qiniu.py
  7. 50 0
      member/models.py

+ 210 - 549
api/admin_views.py
查看文件 

@@ -21,10 +21,12 @@ from account.models import UserInfo
21 21 
 from api.encrypt_views import get_ciphertext
22 22 
 from coupon.models import CouponInfo, UserCouponInfo
23 23 
 from integral.models import SaleclerkSubmitLogInfo
24 
+from kodo.decorators import check_admin
24 25 
 from logs.models import AdministratorLoginLogInfo, ComplementCodeLogInfo, MchInfoEncryptLogInfo
25 26 
 from mch.models import AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo
26 
-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo,
27 
-                           MemberActivityInfo, MemberActivitySignupInfo)
27 
+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo,
28 
+                           MemberActivityContributionWelfareInfo, MemberActivityGroupShareInfo, MemberActivityInfo,
29 
+                           MemberActivitySignupInfo)
28 30 
 from pre.custom_message import sendtemplatemessage, sendwxasubscribemessage
29 31 
 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
30 32 
 from utils.error.errno_utils import (AdministratorStatusCode, ComplementCodeStatusCode,
 
@@ -36,22 +38,18 @@ WECHAT = settings.WECHAT
36 38
37 39
38 40 
 @logit
39 
-def querysn(request):
40 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
41 
-    admin_id = request.POST.get('admin_id', '')
41 
+@check_admin
42 
+def querysn(request, administrator):
42 43 
     model_id = request.POST.get('model_id', '')
43 44 
     sn = request.POST.get('sn', '')
44 45
45 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
46 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
47 
-
48 
-    if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
46 
+    if administrator.admin_type != AdministratorInfo.MAINTENANCE:
49 47 
         return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
50 48
51 
-    log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True, status=True).order_by('has_used', '-pk').first()
49 
+    log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=administrator.brand_id, model_id=model_id, serialNo=sn, submit_during_activity=True, status=True).order_by('has_used', '-pk').first()
52 50
53 51 
     if not log:
54 
-        log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, model_id=model_id, serialNo=sn, status=True).order_by('-submit_during_activity', 'dupload').first()
52 
+        log = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=administrator.brand_id, model_id=model_id, serialNo=sn, status=True).order_by('-submit_during_activity', 'dupload').first()
55 53
56 54 
     if not log:
57 55 
         return response(ProductMachineStatusCode.SN_NOT_FOUND)
 
@@ -60,17 +58,12 @@ def querysn(request):
60 58
61 59
62 60 
 @logit
63 
-def queryusedsn(request):
64 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
65 
-    admin_id = request.POST.get('admin_id', '')
66 
-
67 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
68 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
69 
-
70 
-    if not AdministratorInfo.objects.filter(admin_id=admin_id, admin_type=AdministratorInfo.MAINTENANCE, user_status=AdministratorInfo.ACTIVATED, status=True).exists():
61 
+@check_admin
62 
+def queryusedsn(request, administrator):
63 
+    if administrator.admin_type != AdministratorInfo.MAINTENANCE:
71 64 
         return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
72 65
73 
-    logs = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=brand_id, admin_id=admin_id, has_used=True, status=True).order_by('-used_at')
66 
+    logs = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=administrator.brand_id, admin_id=administrator.admin_id, has_used=True, status=True).order_by('-used_at')
74 67 
     logs = [log.data for log in logs]
75 68
76 69 
     return response(200, 'Query Used SN Success', u'查询核销序列号成功', data={
 
@@ -79,26 +72,17 @@ def queryusedsn(request):
79 72
80 73
81 74 
 @logit
75 
+@check_admin
82 76 
 @transaction.atomic
83 
-def usecoupon(request):
84 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
85 
-    admin_id = request.POST.get('admin_id', '')
77 
+def usecoupon(request, administrator):
86 78 
     model_id = request.POST.get('model_id', '')
87 79 
     sn = request.POST.get('sn', '')
88 80
89 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
90 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
91 
-
92 
-    if not AdministratorInfo.objects.filter(
93 
-        admin_id=admin_id,
94 
-        admin_type=AdministratorInfo.MAINTENANCE,
95 
-        user_status=AdministratorInfo.ACTIVATED,
96 
-        status=True
97 
-    ).exists():
81 
+    if administrator.admin_type != AdministratorInfo.MAINTENANCE:
98 82 
         return response(AdministratorStatusCode.MAINTENANCE_NOT_FOUND)
99 83
100 84 
     log = ConsumeInfoSubmitLogInfo.objects.filter(
101 
-        brand_id=brand_id,
85 
+        brand_id=administrator.brand_id,
102 86 
         model_id=model_id,
103 87 
         serialNo=sn,
104 88 
         submit_during_activity=True,
 
@@ -120,20 +104,11 @@ def usecoupon(request):
120 104
121 105
122 106 
 @logit
123 
-def userinfo(request):
124 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
125 
-    admin_id = request.POST.get('admin_id', '')
107 
+@check_admin
108 
+def userinfo(request, administrator):
126 109 
     page = request.POST.get('page', 1)
127 110 
     num = request.POST.get('num', 20)
128 111
129 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
130 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
131 
-
132 
-    try:
133 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
134 
-    except AdministratorInfo.DoesNotExist:
135 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
136 
-
137 112 
     userinfos = UserInfo.objects.filter(status=True).order_by('-pk')
138 113 
     count = userinfos.count()
139 114 
     userinfos, left = pagination(userinfos, page, num)
 
@@ -147,25 +122,16 @@ def userinfo(request):
147 122
148 123
149 124 
 @logit
150 
-def query_usercoupons(request):
151 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
152 
-    admin_id = request.POST.get('admin_id', '')
125 
+@check_admin
126 
+def query_usercoupons(request, administrator):
153 127 
     user_id = request.POST.get('user_id', '')
154 128
155 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
156 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
157 
-
158 129 
     # 校验用户是否存在
159 130 
     try:
160 131 
         user = UserInfo.objects.get(user_id=user_id)
161 132 
     except UserInfo.DoesNotExist:
162 133 
         return response(UserStatusCode.USER_NOT_FOUND)
163 134
164 
-    try:
165 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
166 
-    except AdministratorInfo.DoesNotExist:
167 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
168 
-
169 135 
     coupons = UserCouponInfo.objects.filter(brand_id=administrator.brand_id, user_id=user_id, status=True).order_by('-pk')
170 136 
     coupons = [coupon.admindata for coupon in coupons]
171 137 
 
@@ -175,26 +141,17 @@ def query_usercoupons(request):
175 141
176 142
177 143 
 @logit
178 
-def query_usergoods(request):
179 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
180 
-    admin_id = request.POST.get('admin_id', '')
144 
+@check_admin
145 
+def query_usergoods(request, administrator):
181 146 
     user_id = request.POST.get('user_id', '')
182 147 
     dupload = request.POST.get('dupload', '')
183 148
184 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
185 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
186 
-
187 149 
     # 校验用户是否存在
188 150 
     try:
189 151 
         user = UserInfo.objects.get(user_id=user_id)
190 152 
     except UserInfo.DoesNotExist:
191 153 
         return response(UserStatusCode.USER_NOT_FOUND)
192 154
193 
-    try:
194 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
195 
-    except AdministratorInfo.DoesNotExist:
196 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
197 
-
198 155 
     logs = ConsumeInfoSubmitLogInfo.objects.filter(brand_id=administrator.brand_id, user_id=user_id, status=True).order_by('-pk')
199 156
200 157 
     if dupload:
 
@@ -208,9 +165,8 @@ def query_usergoods(request):
208 165
209 166
210 167 
 @logit
211 
-def query_userinfo(request):
212 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
213 
-    admin_id = request.POST.get('admin_id', '')
168 
+@check_admin
169 
+def query_userinfo(request, administrator):
214 170 
     query = request.POST.get('query', '')
215 171 
     level = request.POST.get('level', '')
216 172 
     is_member = request.POST.get('is_member', '')
 
@@ -224,14 +180,6 @@ def query_userinfo(request):
224 180 
     page = request.POST.get('page', 1)
225 181 
     num = request.POST.get('num', 20)
226 182
227 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
228 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
229 
-
230 
-    try:
231 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
232 
-    except AdministratorInfo.DoesNotExist:
233 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
234 
-
235 183 
     userinfos = UserInfo.objects.filter(Q(status=True) & (Q(user_id__icontains=query) | Q(nickname__icontains=query) | Q(phone__icontains=query) | Q(memberusercardcode__icontains=query))).order_by('-pk')
236 184
237 185 
     if level:
 
@@ -272,21 +220,12 @@ def query_userinfo(request):
272 220
273 221
274 222 
 @logit
223 
+@check_admin
275 224 
 @transaction.atomic
276 
-def userinfo_update(request):
277 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
278 
-    admin_id = request.POST.get('admin_id', '')
225 
+def userinfo_update(request, administrator):
279 226 
     user_id = request.POST.get('user_id', '')
280 227 
     integral = int(request.POST.get('integral', 0))
281 228
282 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
283 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
284 
-
285 
-    try:
286 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
287 
-    except AdministratorInfo.DoesNotExist:
288 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
289 
-
290 229 
     # 校验用户是否存在
291 230 
     try:
292 231 
         user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True)
 
@@ -294,28 +233,18 @@ def userinfo_update(request):
294 233 
         return response(UserStatusCode.USER_NOT_FOUND)
295 234
296 235 
     user.integral = integral
297 
-
298 236 
     user.save()
299 237
300 238 
     return response(200, 'Userinfo Update Success', u'修改用户信息成功', data={})
301 239
302 240
303 241 
 # 统计
304 
-def statistic_userprofile(request):
305 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
306 
-    admin_id = request.POST.get('admin_id', '')
242 
+@check_admin
243 
+def statistic_userprofile(request, administrator):
307 244 
     start_time = request.POST.get('start_time', '')
308 245 
     end_time = request.POST.get('end_time', '')
309 246 
     model_name = request.POST.get('model_name', '')
310 247
311 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
312 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
313 
-
314 
-    try:
315 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
316 
-    except AdministratorInfo.DoesNotExist:
317 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
318 
-
319 248 
     if model_name:
320 249 
         logs = ConsumeModelSaleStatisticInfo.objects.filter(model_name=model_name, ymd__gte=start_time, ymd__lte=end_time)
321 250 
     else:
 
@@ -345,20 +274,11 @@ def statistic_userprofile(request):
345 274 
     })
346 275
347 276
348 
-def statistic_daily(request):
349 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
350 
-    admin_id = request.POST.get('admin_id', '')
277 
+@check_admin
278 
+def statistic_daily(request, administrator):
351 279 
     start_time = request.POST.get('start_time', '')
352 280 
     end_time = request.POST.get('end_time', '')
353 281
354 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
355 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
356 
-
357 
-    try:
358 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
359 
-    except AdministratorInfo.DoesNotExist:
360 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
361 
-
362 282 
     sale_logs = ConsumeSaleStatisticInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time)
363 283 
     user_logs = ConsumeUserStatisticInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time)
364 284 
 
@@ -371,44 +291,29 @@ def statistic_daily(request):
371 291 
     })
372 292
373 293
374 
-def statistic_model(request):
294 
+@check_admin
295 
+def statistic_model(request, administrator):
375 296 
     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
376 297 
     admin_id = request.POST.get('admin_id', '')
377 298 
     start_time = request.POST.get('start_time', '')
378 299 
     end_time = request.POST.get('end_time', '')
379 300
380 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
381 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
382 
-
383 
-    try:
384 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
385 
-    except AdministratorInfo.DoesNotExist:
386 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
387 
-
388 301 
     logs = ConsumeModelSaleStatisticInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time).values_list('model_name').annotate(Sum('num'))
389 302
390 303 
     logs = [{'model_name': log[0], 'num': log[1]} for log in logs]
304 
+
391 305 
     return response(200, 'Get Model Statistic Success', u'获取型号统计成功', data={
392 306 
         'logs': logs
393 307 
     })
394 308
395 309
396 
-def statistic_distributor(request):
397 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
398 
-    admin_id = request.POST.get('admin_id', '')
310 
+@check_admin
311 
+def statistic_distributor(request, administrator):
399 312 
     start_time = request.POST.get('start_time', '')
400 313 
     end_time = request.POST.get('end_time', '')
401 314 
     model_name = request.POST.get('model_name', '')
402 315 
     distributor_name = request.POST.get('distributor_name', '')
403 316
404 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
405 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
406 
-
407 
-    try:
408 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
409 
-    except AdministratorInfo.DoesNotExist:
410 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
411 
-
412 317 
     daily_sql = 'select id, Count(*) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2, Count((code_version=1 AND has_scan=True) or NULL) AS has_code1_scan_num, Count((code_version=2 AND has_scan=True) or NULL) AS has_code2_scan_num FROM integral_saleclerksubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND test_sn=False AND status=True %s %s GROUP BY ymd;' % (start_time, end_time, ('AND model_uni_name="%s"' % (model_name)) if model_name else '', ('AND distributor_name="%s"' % (distributor_name)) if distributor_name else '')
413 318 
     daily_logs = SaleclerkSubmitLogInfo.objects.raw(daily_sql)
414 319 
 
@@ -435,20 +340,11 @@ def statistic_distributor(request):
435 340 
     })
436 341
437 342
438 
-def dashboard(request):
439 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
440 
-    admin_id = request.POST.get('admin_id', '')
343 
+@check_admin
344 
+def dashboard(request, administrator):
441 345 
     start_time = request.POST.get('start_time', '')
442 346 
     end_time = request.POST.get('end_time', '')
443 347
444 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
445 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
446 
-
447 
-    try:
448 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
449 
-    except AdministratorInfo.DoesNotExist:
450 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
451 
-
452 348 
     # 销售员统计
453 349 
     sale_logs = SaleclerkSubmitLogInfo.objects.filter(ymd__gte=start_time, ymd__lte=end_time, test_user=False, dupload=False, test_sn=False, status=True)
454 350 
 
@@ -483,21 +379,12 @@ def dashboard(request):
483 379 
     })
484 380
485 381
486 
-def statistic_consumer(request):
487 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
488 
-    admin_id = request.POST.get('admin_id', '')
382 
+@check_admin
383 
+def statistic_consumer(request, administrator):
489 384 
     start_time = request.POST.get('start_time', '')
490 385 
     end_time = request.POST.get('end_time', '')
491 386 
     model_name = request.POST.get('model_name', '')
492 387
493 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
494 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
495 
-
496 
-    try:
497 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
498 
-    except AdministratorInfo.DoesNotExist:
499 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
500 
-
501 388 
     # 消费者统计
502 389 
     daily_sql = 'select id, Count(id) AS num, Count(code_version=1 or NULL) AS code1 , Count(code_version=2 or NULL) AS code2 FROM mch_consumeinfosubmitloginfo where ymd >= %s AND ymd <= %s AND test_user=False AND dupload=False AND status=True %s GROUP BY ymd;' % (start_time, end_time, ('AND model_uni_name="%s"' % (model_name)) if model_name else '')
503 390 
 
@@ -523,20 +410,11 @@ def statistic_consumer(request):
523 410 
     })
524 411
525 412
526 
-def statistic_member(request):
527 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
528 
-    admin_id = request.POST.get('admin_id', '')
413 
+@check_admin
414 
+def statistic_member(request, administrator):
529 415 
     start_time = request.POST.get('start_time', '')
530 416 
     end_time = request.POST.get('end_time', '')
531 417
532 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
533 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
534 
-
535 
-    try:
536 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
537 
-    except AdministratorInfo.DoesNotExist:
538 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
539 
-
540 418 
     # 消费者统计
541 419 
     if start_time and end_time:
542 420 
         start_time = datetime.strptime(start_time, '%Y%m%d')
 
@@ -577,9 +455,8 @@ def statistic_member(request):
577 455 
     })
578 456
579 457
580 
-def statistic_coupon(request):
581 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
582 
-    admin_id = request.POST.get('admin_id', '')
458 
+@check_admin
459 
+def statistic_coupon(request, administrator):
583 460 
     start_time = request.POST.get('start_time', '')
584 461 
     end_time = request.POST.get('end_time', '')
585 462 
 
@@ -607,24 +484,15 @@ def statistic_coupon(request):
607 484 
     })
608 485
609 486
610 
-def record_consumer(request):
611 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
612 
-    page = request.POST.get('page', 1)
613 
-    num = request.POST.get('num', 20)
614 
-    admin_id = request.POST.get('admin_id', '')
487 
+@check_admin
488 
+def record_consumer(request, administrator):
615 489 
     start_time = request.POST.get('start_time', '')
616 490 
     end_time = request.POST.get('end_time', '')
617 491 
     query = request.POST.get('query', '')
618 492 
     dupload = request.POST.get('dupload', '')
619 493 
     code_version = request.POST.get('code_version', 0)
620 
-
621 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
622 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
623 
-
624 
-    try:
625 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
626 
-    except AdministratorInfo.DoesNotExist:
627 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
494 
+    page = request.POST.get('page', 1)
495 
+    num = request.POST.get('num', 20)
628 496
629 497 
     logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(status=True) & Q(test_user=False) & (Q(model_name__icontains=query) | Q(phone__icontains=query) | Q(serialNo__icontains=query))).order_by('-pk')
630 498 
 
@@ -648,9 +516,8 @@ def record_consumer(request):
648 516 
     })
649 517
650 518
651 
-def record_consumer_batch(request):
652 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
653 
-    admin_id = request.POST.get('admin_id', '')
519 
+@check_admin
520 
+def record_consumer_batch(request, administrator):
654 521 
     logs = json.loads(request.POST.get('logs', '[]'))
655 522
656 523 
     infos = []
 
@@ -668,9 +535,8 @@ def record_consumer_batch(request):
668 535 
     })
669 536
670 537
671 
-def record_sale(request):
672 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
673 
-    admin_id = request.POST.get('admin_id', '')
538 
+@check_admin
539 
+def record_sale(request, administrator):
674 540 
     page = request.POST.get('page', 1)
675 541 
     num = request.POST.get('num', 20)
676 542 
     start_time = request.POST.get('start_time', '')
 
@@ -681,14 +547,6 @@ def record_sale(request):
681 547 
     code_version = request.POST.get('code_version', 0)
682 548 
     is_online_sale = request.POST.get('is_online_sale', '')
683 549
684 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
685 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
686 
-
687 
-    try:
688 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
689 
-    except AdministratorInfo.DoesNotExist:
690 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
691 
-
692 550 
     logs = SaleclerkSubmitLogInfo.objects.filter(Q(status=True) & Q(test_user=False) & Q(test_sn=False) & (Q(model_name__icontains=query) | Q(clerk_name__icontains=query) | Q(distributor_name__icontains=query) | Q(code__icontains=query))).order_by('-created_at')
693 551
694 552 
     if dupload:
 
@@ -717,9 +575,8 @@ def record_sale(request):
717 575 
     })
718 576
719 577
720 
-def record_sale_batch(request):
721 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
722 
-    admin_id = request.POST.get('admin_id', '')
578 
+@check_admin
579 
+def record_sale_batch(request, administrator):
723 580 
     logs = json.loads(request.POST.get('logs', '[]'))
724 581
725 582 
     infos = []
 
@@ -737,18 +594,8 @@ def record_sale_batch(request):
737 594 
     })
738 595
739 596
740 
-def model_list(request):
741 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
742 
-    admin_id = request.POST.get('admin_id', '')
743 
-
744 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
745 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
746 
-
747 
-    try:
748 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
749 
-    except AdministratorInfo.DoesNotExist:
750 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
751 
-
597 
+@check_admin
598 
+def model_list(request, administrator):
752 599 
     infos = list(ModelInfo.objects.filter(status=True).values_list('model_uni_name', flat=True).distinct().order_by('model_uni_name'))
753 600
754 601 
     return response(200, 'Get Model List Success', u'获取型号列表成功', data={
 
@@ -756,18 +603,8 @@ def model_list(request):
756 603 
     })
757 604
758 605
759 
-def distributor_list(request):
760 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
761 
-    admin_id = request.POST.get('admin_id', '')
762 
-
763 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
764 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
765 
-
766 
-    try:
767 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
768 
-    except AdministratorInfo.DoesNotExist:
769 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
770 
-
606 
+@check_admin
607 
+def distributor_list(request, administrator):
771 608 
     infos = list(DistributorInfo.objects.filter(status=True).values_list('distributor_name', flat=True).distinct().order_by('distributor_name'))
772 609
773 610 
     return response(200, 'Get Model List Success', u'获取经销商列表成功', data={
 
@@ -775,9 +612,8 @@ def distributor_list(request):
775 612 
     })
776 613
777 614
778 
-def member_goods_order(request):
779 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
780 
-    admin_id = request.POST.get('admin_id', '')
615 
+@check_admin
616 
+def member_goods_order(request, administrator):
781 617 
     query = request.POST.get('query', '')
782 618 
     good_type = request.POST.get('good_type', '')
783 619 
     page = request.POST.get('page', 1)
 
@@ -786,14 +622,6 @@ def member_goods_order(request):
786 622 
     start_time = request.POST.get('start_time', '')
787 623 
     end_time = request.POST.get('end_time', '')
788 624
789 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
790 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
791 
-
792 
-    try:
793 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
794 
-    except AdministratorInfo.DoesNotExist:
795 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
796 
-
797 625 
     orders = GoodsOrderInfo.objects.filter(Q(phone__icontains=query) | Q(user_id=query) | Q(title__icontains=query) & Q(status=True)).order_by('-pk')
798 626
799 627 
     if good_type:
 
@@ -821,40 +649,22 @@ def member_goods_order(request):
821 649 
     })
822 650
823 651
824 
-def member_goods_order_update(request):
825 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
826 
-    admin_id = request.POST.get('admin_id', '')
652 
+@check_admin
653 
+def member_goods_order_update(request, administrator):
827 654 
     order_id = request.POST.get('order_id', '')
828 655 
     tracking_number = request.POST.get('tracking_number', '')
829 656 
     remark = request.POST.get('remark', u'您的礼品正在快马加鞭赶来，请耐心等待呦~')
830 657
831 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
832 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
833 
-
834 
-    try:
835 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
836 
-    except AdministratorInfo.DoesNotExist:
837 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
838 
-
839 658 
     if not send_trackingNumber_message(order_id, tracking_number, remark):
840 659 
         return response(400001, 'Member Goods Order Update Failure', u'会员商品订单修改失败')
841 660
842 661 
     return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
843 662
844 663
845 
-def member_goods_order_batch_update(request):
846 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
847 
-    admin_id = request.POST.get('admin_id', '')
664 
+@check_admin
665 
+def member_goods_order_batch_update(request, administrator):
848 666 
     orders = json.loads(request.POST.get('orders', '[]'))
849 667
850 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
851 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
852 
-
853 
-    try:
854 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
855 
-    except AdministratorInfo.DoesNotExist:
856 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
857 
-
858 668 
     err_orders = []
859 669 
     for order in orders:
860 670 
         if not send_trackingNumber_message(order.get('order_id', ''), order.get('tracking_number', ''), order.get('remark', u'您的礼品正在快马加鞭赶来，请耐心等待呦~')):
 
@@ -908,9 +718,8 @@ def send_trackingNumber_message(order_id, tracking_number, remark):
908 718 
         return False
909 719
910 720
911 
-def record_warehouse(request):
912 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
913 
-    admin_id = request.POST.get('admin_id', '')
721 
+@check_admin
722 
+def record_warehouse(request, administrator):
914 723 
     model_name = request.POST.get('model_name', '')
915 724 
     sn = request.POST.get('sn', '')
916 725 
     start_time = request.POST.get('start_time', '')
 
@@ -918,14 +727,6 @@ def record_warehouse(request):
918 727 
     page = request.POST.get('page', 1)
919 728 
     num = request.POST.get('num', 20)
920 729
921 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
922 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
923 
-
924 
-    try:
925 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
926 
-    except AdministratorInfo.DoesNotExist:
927 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
928 
-
929 730 
     models = ModelInfo.objects.filter(model_name__icontains=model_name, status=True).values_list('pk', flat=True)
930 731 
     logs = MchInfoEncryptLogInfo.objects.filter(model_pk__in=models, sn__icontains=sn, status=True)
931 732 
 
@@ -947,9 +748,8 @@ def record_warehouse(request):
947 748 
     })
948 749
949 750
950 
-def member_activity_list(request):
951 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
952 
-    admin_id = request.POST.get('admin_id', '')
751 
+@check_admin
752 
+def member_activity_list(request, administrator):
953 753 
     activity_type = request.POST.get('activity_type', '')
954 754 
     title = request.POST.get('title', '')
955 755 
     start_time = request.POST.get('start_time', '')
 
@@ -957,15 +757,6 @@ def member_activity_list(request):
957 757 
     page = request.POST.get('page', 1)
958 758 
     num = request.POST.get('num', 20)
959 759
960 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
961 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
962 
-
963 
-    try:
964 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
965 
-    except AdministratorInfo.DoesNotExist:
966 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
967 
-
968 
-    # logs = MemberActivityInfo.objects.filter(title__icontains=title)
969 760 
     logs = MemberActivityInfo.objects.filter(status=True)
970 761
971 762 
     if activity_type:
 
@@ -992,34 +783,22 @@ def member_activity_list(request):
992 783 
     })
993 784
994 785
995 
-def member_activity_details(request):
996 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
997 
-    admin_id = request.POST.get('admin_id', '')
786 
+@check_admin
787 
+def member_activity_detail(request, administrator):
998 788 
     activity_id = request.POST.get('activity_id', '')
999 789
1000 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1001 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1002 
-
1003 
-    try:
1004 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1005 
-    except AdministratorInfo.DoesNotExist:
1006 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1007 
-
1008 790 
     try:
1009 791 
         log = MemberActivityInfo.objects.get(activity_id=activity_id)
1010 792 
     except MemberActivityInfo.DoesNotExist:
1011 793 
         return response()
1012 794
1013 
-    log = log.admindetails
1014 
-
1015 795 
     return response(200, 'Get Member Activity Record Details Success', u'获取会员活动详情成功', data={
1016 
-        'log': log,
796 
+        'log': log.admindetails,
1017 797 
     })
1018 798
1019 799
1020 
-def member_activity_update(request):
1021 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1022 
-    admin_id = request.POST.get('admin_id', '')
800 
+@check_admin
801 
+def member_activity_update(request, administrator):
1023 802 
     activity_id = request.POST.get('activity_id', '')
1024 803 
     activity_type = int(request.POST.get('activity_type', 0))
1025 804 
     title = request.POST.get('title', '')
 
@@ -1043,14 +822,6 @@ def member_activity_update(request):
1043 822 
     share_h5_link = request.POST.get('share_h5_link', '')
1044 823 
     activity_state = int(request.POST.get('activity_state', 0))
1045 824
1046 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1047 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1048 
-
1049 
-    try:
1050 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1051 
-    except AdministratorInfo.DoesNotExist:
1052 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1053 
-
1054 825 
     try:
1055 826 
         log = MemberActivityInfo.objects.get(activity_id=activity_id, status=True)
1056 827 
     except MemberActivityInfo.DoesNotExist:
 
@@ -1083,9 +854,8 @@ def member_activity_update(request):
1083 854 
     return response(200, 'MemberActivityInfo Update Success', u'会员活动更新成功')
1084 855
1085 856
1086 
-def member_activity_create(request):
1087 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1088 
-    admin_id = request.POST.get('admin_id', '')
857 
+@check_admin
858 
+def member_activity_create(request, administrator):
1089 859 
     activity_type = int(request.POST.get('activity_type', 0))
1090 860 
     title = request.POST.get('title', '')
1091 861 
     subtitle = request.POST.get('subtitle', '')
 
@@ -1108,14 +878,6 @@ def member_activity_create(request):
1108 878 
     share_h5_link = request.POST.get('share_h5_link', '')
1109 879 
     activity_state = int(request.POST.get('activity_state', 0))
1110 880
1111 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1112 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1113 
-
1114 
-    try:
1115 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1116 
-    except AdministratorInfo.DoesNotExist:
1117 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1118 
-
1119 881 
     MemberActivityInfo.objects.create(
1120 882 
         brand_id=administrator.brand_id,
1121 883 
         activity_type=activity_type,
 
@@ -1145,21 +907,12 @@ def member_activity_create(request):
1145 907 
     return response(200, 'MemberActivityInfo Create Success', u'会员活动创建成功')
1146 908
1147 909
1148 
-def member_activity_share_list(request):
1149 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1150 
-    admin_id = request.POST.get('admin_id', '')
910 
+@check_admin
911 
+def member_activity_share_list(request, administrator):
1151 912 
     activity_id = request.POST.get('activity_id', '')
1152 913 
     page = int(request.POST.get('page', 1))
1153 914 
     num = int(request.POST.get('num', 20))
1154 915
1155 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1156 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1157 
-
1158 
-    try:
1159 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1160 
-    except AdministratorInfo.DoesNotExist:
1161 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1162 
-
1163 916 
     logs = MemberActivityGroupShareInfo.objects.filter(activity_id=activity_id, status=True)
1164 917
1165 918 
     total_integral = logs.aggregate(Sum('integral'))['integral__sum']
 
@@ -1177,21 +930,12 @@ def member_activity_share_list(request):
1177 930 
     })
1178 931
1179 932
1180 
-def member_activity_register_list(request):
1181 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1182 
-    admin_id = request.POST.get('admin_id', '')
933 
+@check_admin
934 
+def member_activity_register_list(request, administrator):
1183 935 
     activity_id = request.POST.get('activity_id', '')
1184 936 
     page = int(request.POST.get('page', 1))
1185 937 
     num = int(request.POST.get('num', 20))
1186 938
1187 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1188 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1189 
-
1190 
-    try:
1191 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1192 
-    except AdministratorInfo.DoesNotExist:
1193 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1194 
-
1195 939 
     logs = MemberActivitySignupInfo.objects.filter(activity_id=activity_id, status=True)
1196 940
1197 941 
     count = logs.count()
 
@@ -1205,21 +949,12 @@ def member_activity_register_list(request):
1205 949 
     })
1206 950
1207 951
952 
+@check_admin
1208 953 
 @transaction.atomic
1209 
-def member_activity_contribute_audit(request):
1210 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1211 
-    admin_id = request.POST.get('admin_id', '')
954 
+def member_activity_contribute_audit(request, administrator):
1212 955 
     contribution_id = request.POST.get('contribution_id', '')
1213 956 
     audit = get_query_value(request, 'audit', val_cast_type='int')
1214 957
1215 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1216 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1217 
-
1218 
-    try:
1219 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1220 
-    except AdministratorInfo.DoesNotExist:
1221 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1222 
-
1223 958 
     try:
1224 959 
         contribution = MemberActivityContributionInfo.objects.select_for_update().get(contribution_id=contribution_id, status=True)
1225 960 
     except MemberActivityContributionInfo.DoesNotExist:
 
@@ -1231,21 +966,12 @@ def member_activity_contribute_audit(request):
1231 966 
     return response(200, 'Member Activity Contribution Audit Success', u'会员活动投稿审批成功')
1232 967
1233 968
969 
+@check_admin
1234 970 
 @transaction.atomic
1235 
-def member_activity_contribute_selected(request):
1236 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1237 
-    admin_id = request.POST.get('admin_id', '')
971 
+def member_activity_contribute_selected(request, administrator):
1238 972 
     contribution_id = request.POST.get('contribution_id', '')
1239 973 
     selected = get_query_value(request, 'selected', val_cast_type='int')
1240 974
1241 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1242 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1243 
-
1244 
-    try:
1245 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1246 
-    except AdministratorInfo.DoesNotExist:
1247 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1248 
-
1249 975 
     try:
1250 976 
         contribution = MemberActivityContributionInfo.objects.select_for_update().get(contribution_id=contribution_id, status=True)
1251 977 
     except MemberActivityContributionInfo.DoesNotExist:
 
@@ -1257,22 +983,99 @@ def member_activity_contribute_selected(request):
1257 983 
     return response(200, 'Member Activity Contribution Selected Success', u'会员活动投稿入围成功')
1258 984
1259 985
1260 
-def coupon_list(request):
1261 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1262 
-    admin_id = request.POST.get('admin_id', '')
1263 
-    title = request.POST.get('title', '')
1264 
-    start_time = request.POST.get('start_time', '')
1265 
-    end_time = request.POST.get('end_time', '')
986 
+@check_admin
987 
+def member_activity_contribute_welfare_list(request, administrator):
988 
+    welfare_type = request.POST.get('welfare_type', '')
989 
+    welfare_title = request.POST.get('welfare_title', '')
1266 990 
     page = request.POST.get('page', 1)
1267 991 
     num = request.POST.get('num', 20)
1268 992
1269 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1270 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
993 
+    welfares = MemberActivityContributionWelfareInfo.objects.filter(status=True)
994 
+
995 
+    if welfare_type:
996 
+        welfares = welfares.filter(welfare_type=welfare_type)
997 
+
998 
+    if welfare_title:
999 
+        welfares = welfares.filter(welfare_title__icontains=welfare_title)
1000 
+
1001 
+    welfares = welfares.order_by('-pk')
1002 
+
1003 
+    count = welfares.count()
1004 
+    welfares, left = pagination(welfares, page, num)
1005 
+    welfares = [welfare.data for welfare in welfares]
1006 
+
1007 
+    return response(200, 'Get Member Activity Contribute Welfare List Success', u'获取会员活动投稿福利列表成功', data={
1008 
+        'welfares': welfares,
1009 
+        'left': left,
1010 
+        'count': count
1011 
+    })
1012 
+
1013 
+
1014 
+@check_admin
1015 
+def member_activity_contribute_welfare_detail(request, administrator):
1016 
+    welfare_id = request.POST.get('welfare_id', '')
1271 1017
1272 1018 
     try:
1273 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1274 
-    except AdministratorInfo.DoesNotExist:
1275 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1019 
+        welfare = MemberActivityContributionWelfareInfo.objects.get(welfare_id=welfare_id)
1020 
+    except MemberActivityContributionWelfareInfo.DoesNotExist:
1021 
+        return response()
1022 
+
1023 
+    return response(200, 'Get Member Activity Contribute Welfare Detail Success', u'获取会员活动投稿福利详情成功', data={
1024 
+        'welfare': welfare.data,
1025 
+    })
1026 
+
1027 
+
1028 
+@check_admin
1029 
+def member_activity_contribute_welfare_update(request, administrator):
1030 
+    welfare_id = request.POST.get('welfare_id', '')
1031 
+    welfare_type = int(request.POST.get('welfare_type', 0))
1032 
+    welfare_title = request.POST.get('welfare_title', '')
1033 
+    welfare_detail = request.POST.get('welfare_detail', '')
1034 
+    welfare_value = request.POST.get('welfare_value', '')
1035 
+    welfare_image_path = request.POST.get('welfare_image_path', '')
1036 
+
1037 
+    try:
1038 
+        welfare = MemberActivityContributionWelfareInfo.objects.get(welfare_id=welfare_id, status=True)
1039 
+    except MemberActivityContributionWelfareInfo.DoesNotExist:
1040 
+        return response()
1041 
+
1042 
+    welfare.welfare_type = welfare_type
1043 
+    welfare.welfare_title = welfare_title
1044 
+    welfare.welfare_detail = welfare_detail
1045 
+    welfare.welfare_value = welfare_value
1046 
+    welfare.welfare_image = welfare_image_path
1047 
+    welfare.save()
1048 
+
1049 
+    return response(200, 'Update Member Activity Contribute Welfare Success', u'更新会员活动投稿福利成功')
1050 
+
1051 
+
1052 
+@check_admin
1053 
+def member_activity_contribute_welfare_create(request, administrator):
1054 
+    welfare_type = int(request.POST.get('welfare_type', 0))
1055 
+    welfare_title = request.POST.get('welfare_title', '')
1056 
+    welfare_detail = request.POST.get('welfare_detail', '')
1057 
+    welfare_value = request.POST.get('welfare_value', '')
1058 
+    welfare_image_path = request.POST.get('welfare_image_path', '')
1059 
+
1060 
+    MemberActivityContributionWelfareInfo.objects.create(
1061 
+        brand_id=administrator.brand_id,
1062 
+        welfare_type=welfare_type,
1063 
+        welfare_title=welfare_title,
1064 
+        welfare_detail=welfare_detail,
1065 
+        welfare_value=welfare_value,
1066 
+        welfare_image=welfare_image_path,
1067 
+    )
1068 
+
1069 
+    return response(200, 'Create Member Activity Contribute Welfare Success', u'创建会员活动投稿福利成功')
1070 
+
1071 
+
1072 
+@check_admin
1073 
+def coupon_list(request, administrator):
1074 
+    title = request.POST.get('title', '')
1075 
+    start_time = request.POST.get('start_time', '')
1076 
+    end_time = request.POST.get('end_time', '')
1077 
+    page = request.POST.get('page', 1)
1078 
+    num = request.POST.get('num', 20)
1276 1079
1277 1080 
     logs = CouponInfo.objects.filter(coupon_title__icontains=title, status=True)
1278 1081 
 
@@ -1294,19 +1097,10 @@ def coupon_list(request):
1294 1097 
     })
1295 1098
1296 1099
1297 
-def coupon_details(request):
1298 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1299 
-    admin_id = request.POST.get('admin_id', '')
1100 
+@check_admin
1101 
+def coupon_detail(request, administrator):
1300 1102 
     coupon_id = request.POST.get('coupon_id', '')
1301 1103
1302 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1303 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1304 
-
1305 
-    try:
1306 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1307 
-    except AdministratorInfo.DoesNotExist:
1308 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1309 
-
1310 1104 
     try:
1311 1105 
         log = CouponInfo.objects.get(coupon_id=coupon_id)
1312 1106 
     except CouponInfo.DoesNotExist:
 
@@ -1319,9 +1113,8 @@ def coupon_details(request):
1319 1113 
     })
1320 1114
1321 1115
1322 
-def coupon_create(request):
1323 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1324 
-    admin_id = request.POST.get('admin_id', '')
1116 
+@check_admin
1117 
+def coupon_create(request, administrator):
1325 1118 
     coupon_title = request.POST.get('coupon_title', '')
1326 1119 
     coupon_detail = request.POST.get('coupon_detail', '')
1327 1120 
     coupon_value = int(request.POST.get('coupon_value', 0))
 
@@ -1331,16 +1124,8 @@ def coupon_create(request):
1331 1124 
     coupon_expire_at = request.POST.get('coupon_expire_at', '')
1332 1125 
     is_coupon_admin_writeoff = int(request.POST.get('is_coupon_admin_writeoff', 1))
1333 1126
1334 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1335 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1336 
-
1337 
-    try:
1338 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1339 
-    except AdministratorInfo.DoesNotExist:
1340 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1341 
-
1342 1127 
     info = CouponInfo.objects.create(
1343 
-        brand_id=brand_id,
1128 
+        brand_id=administrator.brand_id,
1344 1129 
         coupon_title=coupon_title,
1345 1130 
         coupon_detail=coupon_detail,
1346 1131 
         coupon_value=coupon_value,
 
@@ -1357,9 +1142,8 @@ def coupon_create(request):
1357 1142 
     return response(200, 'CouponInfo Create Success', u'劵创建成功')
1358 1143
1359 1144
1360 
-def coupon_update(request):
1361 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1362 
-    admin_id = request.POST.get('admin_id', '')
1145 
+@check_admin
1146 
+def coupon_update(request, administrator):
1363 1147 
     coupon_id = request.POST.get('coupon_id', '')
1364 1148 
     coupon_title = request.POST.get('coupon_title', '')
1365 1149 
     coupon_detail = request.POST.get('coupon_detail', '')
 
@@ -1370,20 +1154,12 @@ def coupon_update(request):
1370 1154 
     coupon_expire_at = request.POST.get('coupon_expire_at', '')
1371 1155 
     is_coupon_admin_writeoff = int(request.POST.get('is_coupon_admin_writeoff', 1))
1372 1156
1373 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1374 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1375 
-
1376 
-    try:
1377 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1378 
-    except AdministratorInfo.DoesNotExist:
1379 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1380 
-
1381 1157 
     try:
1382 1158 
         log = CouponInfo.objects.get(coupon_id=coupon_id, status=True)
1383 1159 
     except CouponInfo.DoesNotExist:
1384 1160 
         return response()
1385 1161
1386 
-    log.brand_id = brand_id
1162 
+    log.brand_id = administrator.brand_id
1387 1163 
     log.coupon_title = coupon_title
1388 1164 
     log.coupon_detail = coupon_detail
1389 1165 
     log.coupon_value = coupon_value
 
@@ -1398,19 +1174,10 @@ def coupon_update(request):
1398 1174 
     return response(200, 'CouponInfo Update Success', u'劵更新成功')
1399 1175
1400 1176
1401 
-def coupon_delete(request):
1402 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1403 
-    admin_id = request.POST.get('admin_id', '')
1177 
+@check_admin
1178 
+def coupon_delete(request, administrator):
1404 1179 
     coupon_id = request.POST.get('activity_id', '')
1405 1180
1406 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1407 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1408 
-
1409 
-    try:
1410 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1411 
-    except AdministratorInfo.DoesNotExist:
1412 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1413 
-
1414 1181 
     try:
1415 1182 
         log = CouponInfo.objects.get(coupon_id=coupon_id, status=True)
1416 1183 
     except CouponInfo.DoesNotExist:
 
@@ -1422,26 +1189,18 @@ def coupon_delete(request):
1422 1189 
     return response(200, 'CouponInfo Delete Success', u'劵删除成功')
1423 1190
1424 1191
1425 
-def member_goods_list(request):
1426 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1427 
-    admin_id = request.POST.get('admin_id', '')
1192 
+@check_admin
1193 
+def member_goods_list(request, administrator):
1428 1194 
     title = request.POST.get('title', '')
1429 1195 
     page = request.POST.get('page', 1)
1430 1196 
     num = request.POST.get('num', 20)
1431 1197
1432 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1433 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1434 
-
1435 
-    try:
1436 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1437 
-    except AdministratorInfo.DoesNotExist:
1438 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1439 
-
1440 1198 
     logs = GoodsInfo.objects.filter(title__icontains=title, only_for_member=False).order_by('-pk')
1441 1199
1442 1200 
     count = logs.count()
1443 1201 
     logs, left = pagination(logs, page, num)
1444 1202 
     logs = [log.admindata for log in logs]
1203 
+
1445 1204 
     return response(200, 'Get Member Goods Success', u'获取会员商品成功', data={
1446 1205 
         'logs': logs,
1447 1206 
         'left': left,
 
@@ -1449,19 +1208,10 @@ def member_goods_list(request):
1449 1208 
     })
1450 1209
1451 1210
1452 
-def member_goods_details(request):
1453 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1454 
-    admin_id = request.POST.get('admin_id', '')
1211 
+@check_admin
1212 
+def member_goods_detail(request, administrator):
1455 1213 
     good_id = request.POST.get('good_id', '')
1456 1214
1457 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1458 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1459 
-
1460 
-    try:
1461 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1462 
-    except AdministratorInfo.DoesNotExist:
1463 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1464 
-
1465 1215 
     try:
1466 1216 
         log = GoodsInfo.objects.get(good_id=good_id)
1467 1217 
     except GoodsInfo.DoesNotExist:
 
@@ -1474,9 +1224,8 @@ def member_goods_details(request):
1474 1224 
     })
1475 1225
1476 1226
1477 
-def member_goods_update(request):
1478 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1479 
-    admin_id = request.POST.get('admin_id', '')
1227 
+@check_admin
1228 
+def member_goods_update(request, administrator):
1480 1229 
     good_id = request.POST.get('good_id', '')
1481 1230 
     title = request.POST.get('title', '')
1482 1231 
     desc = request.POST.get('desc', '')
 
@@ -1488,14 +1237,6 @@ def member_goods_update(request):
1488 1237 
     integral = int(request.POST.get('integral', 0))
1489 1238 
     fee = int(request.POST.get('fee', 0))
1490 1239
1491 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1492 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1493 
-
1494 
-    try:
1495 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1496 
-    except AdministratorInfo.DoesNotExist:
1497 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1498 
-
1499 1240 
     try:
1500 1241 
         log = GoodsInfo.objects.get(good_id=good_id, status=True)
1501 1242 
     except GoodsInfo.DoesNotExist:
 
@@ -1515,9 +1256,8 @@ def member_goods_update(request):
1515 1256 
     return response(200, 'GoodsInfo Update Success', u'积分商品更新成功')
1516 1257
1517 1258
1518 
-def member_goods_create(request):
1519 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1520 
-    admin_id = request.POST.get('admin_id', '')
1259 
+@check_admin
1260 
+def member_goods_create(request, administrator):
1521 1261 
     good_type = int(request.POST.get('good_type', 0))
1522 1262 
     title = request.POST.get('title', '')
1523 1263 
     desc = request.POST.get('desc', '')
 
@@ -1529,14 +1269,6 @@ def member_goods_create(request):
1529 1269 
     integral = int(request.POST.get('integral', 0))
1530 1270 
     fee = int(request.POST.get('fee', 0))
1531 1271
1532 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1533 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1534 
-
1535 
-    try:
1536 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1537 
-    except AdministratorInfo.DoesNotExist:
1538 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1539 
-
1540 1272 
     GoodsInfo.objects.create(
1541 1273 
         brand_id=administrator.brand_id,
1542 1274 
         good_type=good_type,
 
@@ -1554,23 +1286,14 @@ def member_goods_create(request):
1554 1286 
     return response(200, 'GoodsInfo Create Success', u'积分商品创建成功')
1555 1287
1556 1288
1557 
-def complement_code_list(request):
1558 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1559 
-    admin_id = request.POST.get('admin_id', '')
1560 
-    page = request.POST.get('page', 1)
1561 
-    num = request.POST.get('num', 20)
1289 
+@check_admin
1290 
+def complement_code_list(request, administrator):
1562 1291 
     start_time = request.POST.get('start_time', '')
1563 1292 
     end_time = request.POST.get('end_time', '')
1564 1293 
     type_ = request.POST.get('type', '')
1565 1294 
     query = request.POST.get('query', '')
1566 
-
1567 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1568 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1569 
-
1570 
-    try:
1571 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1572 
-    except AdministratorInfo.DoesNotExist:
1573 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1295 
+    page = request.POST.get('page', 1)
1296 
+    num = request.POST.get('num', 20)
1574 1297
1575 1298 
     logs = ComplementCodeLogInfo.objects.filter(status=True)
1576 1299 
 
@@ -1602,21 +1325,14 @@ def complement_code_list(request):
1602 1325 
     })
1603 1326
1604 1327
1328 
+@check_admin
1605 1329 
 @transaction.atomic
1606 
-def complement_code_audit(request):
1330 
+def complement_code_audit(request, administrator):
1607 1331 
     brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1608 1332 
     admin_id = request.POST.get('admin_id', '')
1609 1333 
     log_id = request.POST.get('log_id', '')
1610 1334 
     audit_status = int(request.POST.get('audit_status', 0))  # -1 审核不通过, 1 审核通过
1611 1335
1612 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1613 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1614 
-
1615 
-    try:
1616 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1617 
-    except AdministratorInfo.DoesNotExist:
1618 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1619 
-
1620 1336 
     if audit_status not in [ComplementCodeLogInfo.AUDIT_REFUSED, ComplementCodeLogInfo.AUDIT_PASS]:
1621 1337 
         return response(ComplementCodeStatusCode.COMPLEMENT_CODE_STATUS_INVALID)
1622 1338 
 
@@ -1699,21 +1415,12 @@ def complement_code_audit(request):
1699 1415 
     return response()
1700 1416
1701 1417
1418 
+@check_admin
1702 1419 
 @transaction.atomic
1703 
-def complement_code_contacted(request):
1704 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1705 
-    admin_id = request.POST.get('admin_id', '')
1420 
+def complement_code_contacted(request, administrator):
1706 1421 
     log_id = request.POST.get('log_id', '')
1707 1422 
     is_contacted = int(request.POST.get('is_contacted', 0))  # 0 未联系, 1 已联系
1708 1423
1709 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1710 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1711 
-
1712 
-    try:
1713 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1714 
-    except AdministratorInfo.DoesNotExist:
1715 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1716 
-
1717 1424 
     try:
1718 1425 
         log = ComplementCodeLogInfo.objects.select_for_update().get(log_id=log_id, status=True)
1719 1426 
     except ComplementCodeLogInfo.DoesNotExist:
 
@@ -1725,20 +1432,11 @@ def complement_code_contacted(request):
1725 1432 
     return response()
1726 1433
1727 1434
1728 
-def administrator_list(request):
1729 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1730 
-    admin_id = request.POST.get('admin_id', '')
1435 
+@check_admin
1436 
+def administrator_list(request, administrator):
1731 1437 
     page = request.POST.get('page', 1)
1732 1438 
     num = request.POST.get('num', 20)
1733 1439
1734 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1735 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1736 
-
1737 
-    try:
1738 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1739 
-    except AdministratorInfo.DoesNotExist:
1740 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1741 
-
1742 1440 
     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
1743 1441 
         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
1744 1442 
 
@@ -1747,6 +1445,7 @@ def administrator_list(request):
1747 1445 
     count = logs.count()
1748 1446 
     logs, left = pagination(logs, page, num)
1749 1447 
     logs = [log.admindata for log in logs]
1448 
+
1750 1449 
     return response(200, 'Get Admin List Success', u'获取后台管理员成功', data={
1751 1450 
         'logs': logs,
1752 1451 
         'left': left,
 
@@ -1754,31 +1453,21 @@ def administrator_list(request):
1754 1453 
     })
1755 1454
1756 1455
1757 
-def administrator_create(request):
1758 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1759 
-    admin_id = request.POST.get('admin_id', '')
1760 
-
1456 
+@check_admin
1457 
+def administrator_create(request, administrator):
1761 1458 
     admin_type = request.POST.get('admin_type', '')
1762 1459 
     phone = request.POST.get('phone', '')
1763 1460 
     name = request.POST.get('name', '')
1764 1461 
     password = request.POST.get('password', '')
1765 1462 
     brand_name = request.POST.get('brand_name', '')
1766 1463
1767 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1768 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1769 
-
1770 
-    try:
1771 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1772 
-    except AdministratorInfo.DoesNotExist:
1773 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1774 
-
1775 1464 
     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
1776 1465 
         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
1777 1466
1778 1467 
     encryption = make_password(strip(password), settings.MAKE_PASSWORD_SALT, settings.MAKE_PASSWORD_HASHER)
1779 1468
1780 1469 
     AdministratorInfo.objects.create(
1781 
-        brand_id=brand_id,
1470 
+        brand_id=administrator.brand_id,
1782 1471 
         brand_name=brand_name,
1783 1472 
         admin_type=admin_type,
1784 1473 
         phone=phone,
 
@@ -1790,24 +1479,14 @@ def administrator_create(request):
1790 1479 
     return response(200, 'Create Admin Success', u'创建后台管理员成功')
1791 1480
1792 1481
1793 
-def administrator_update(request):
1794 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1795 
-    admin_id = request.POST.get('admin_id', '')
1796 
-
1482 
+@check_admin
1483 
+def administrator_update(request, administrator):
1797 1484 
     target_admin_id = request.POST.get('target_admin_id', '')
1798 1485 
     admin_type = int(request.POST.get('admin_type', -1))
1799 1486 
     phone = request.POST.get('phone', '')
1800 1487 
     name = request.POST.get('name', '')
1801 1488 
     password = request.POST.get('password', '')
1802 1489
1803 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1804 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1805 
-
1806 
-    try:
1807 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1808 
-    except AdministratorInfo.DoesNotExist:
1809 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1810 
-
1811 1490 
     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
1812 1491 
         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
1813 1492 
 
@@ -1832,19 +1511,10 @@ def administrator_update(request):
1832 1511 
     return response(200, 'Update Admin Success', u'更新后台管理员成功')
1833 1512
1834 1513
1835 
-def administrator_delete(request):
1836 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1837 
-    admin_id = request.POST.get('admin_id', '')
1514 
+@check_admin
1515 
+def administrator_delete(request, administrator):
1838 1516 
     target_admin_id = request.POST.get('target_admin_id', '')
1839 1517
1840 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1841 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1842 
-
1843 
-    try:
1844 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1845 
-    except AdministratorInfo.DoesNotExist:
1846 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1847 
-
1848 1518 
     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
1849 1519 
         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
1850 1520 
 
@@ -1853,21 +1523,12 @@ def administrator_delete(request):
1853 1523 
     return response(200, 'Delete Admin Success', u'删除后台管理员成功')
1854 1524
1855 1525
1856 
-def administrator_login_list(request):
1857 
-    brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
1858 
-    admin_id = request.POST.get('admin_id', '')
1526 
+@check_admin
1527 
+def administrator_login_list(request, administrator):
1859 1528 
     page = request.POST.get('page', 1)
1860 1529 
     num = request.POST.get('num', 20)
1861 1530 
     target_admin_id = request.POST.get('target_admin_id', '')
1862 1531
1863 
-    if brand_id != settings.KODO_DEFAULT_BRAND_ID:
1864 
-        return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
1865 
-
1866 
-    try:
1867 
-        administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
1868 
-    except AdministratorInfo.DoesNotExist:
1869 
-        return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
1870 
-
1871 1532 
     if administrator.admin_type != AdministratorInfo.ADMINISTRATOR:
1872 1533 
         return response(AdministratorStatusCode.ADMINISTRATOR_PERMISSION_DENIED)
1873 1534

+ 8 - 3
api/urls.py
查看文件 

@@ -165,7 +165,7 @@ urlpatterns += [
165 165 
     url(r'^admin/member/goods/order/batch/update$', admin_views.member_goods_order_batch_update, name='member_goods_order_batch_update'),
166 166
167 167 
     url(r'^admin/member/activity/list$', admin_views.member_activity_list, name='member_activity_list'),
168 
-    url(r'^admin/member/activity/details$', admin_views.member_activity_details, name='member_activity_details'),
168 
+    url(r'^admin/member/activity/details$', admin_views.member_activity_detail, name='member_activity_detail'),
169 169 
     url(r'^admin/member/activity/update$', admin_views.member_activity_update, name='member_activity_update'),
170 170 
     url(r'^admin/member/activity/create$', admin_views.member_activity_create, name='member_activity_create'),
171 171 
     url(r'^admin/member/activity/share/list$', admin_views.member_activity_share_list, name='member_activity_share_list'),
 
@@ -175,14 +175,19 @@ urlpatterns += [
175 175 
     url(r'^admin/member/activity/contribute/audit$', admin_views.member_activity_contribute_audit, name='admin_member_activity_contribute_audit'),
176 176 
     url(r'^admin/member/activity/contribute/selected$', admin_views.member_activity_contribute_selected, name='admin_member_activity_contribute_selected'),
177 177
178 
+    url(r'^admin/member/activity/contribute/welfare/list$', admin_views.member_activity_contribute_welfare_list, name='member_activity_contribute_welfare_list'),
179 
+    url(r'^admin/member/activity/contribute/welfare/detail$', admin_views.member_activity_contribute_welfare_detail, name='member_activity_contribute_welfare_detail'),
180 
+    url(r'^admin/member/activity/contribute/welfare/update$', admin_views.member_activity_contribute_welfare_update, name='member_activity_contribute_welfare_update'),
181 
+    url(r'^admin/member/activity/contribute/welfare/create$', admin_views.member_activity_contribute_welfare_create, name='member_activity_contribute_welfare_create'),
182 
+
178 183 
     url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'),
179 
-    url(r'^admin/coupon/details$', admin_views.coupon_details, name='coupon_update'),
184 
+    url(r'^admin/coupon/details$', admin_views.coupon_detail, name='coupon_detail'),
180 185 
     url(r'^admin/coupon/create$', admin_views.coupon_create, name='coupon_create'),
181 186 
     url(r'^admin/coupon/update$', admin_views.coupon_update, name='coupon_update'),
182 187 
     url(r'^admin/coupon/delete$', admin_views.coupon_delete, name='coupon_delete'),
183 188
184 189 
     url(r'^admin/member/goods/list$', admin_views.member_goods_list, name='member_goods_list'),
185 
-    url(r'^admin/member/goods/details$', admin_views.member_goods_details, name='member_goods_details'),
190 
+    url(r'^admin/member/goods/details$', admin_views.member_goods_detail, name='member_goods_detail'),
186 191 
     url(r'^admin/member/goods/create$', admin_views.member_goods_create, name='member_goods_create'),
187 192 
     url(r'^admin/member/goods/update$', admin_views.member_goods_update, name='member_goods_update'),
188 193

+ 39 - 0
kodo/decorators.py
查看文件 

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

+ 9 - 3
member/admin.py
查看文件 

@@ -5,9 +5,9 @@ from django.contrib import admin
5 5 
 from django_admin import DeleteModelAdmin
6 6
7 7 
 from account.models import UserInfo
8 
-from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo, MemberActivityGroupShareInfo,
9 
-                           MemberActivityInfo, MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo,
10 
-                           ShotTypeInfo)
8 
+from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo,
9 
+                           MemberActivityContributionWelfareInfo, MemberActivityGroupShareInfo, MemberActivityInfo,
10 
+                           MemberActivitySigninInfo, MemberActivitySignupInfo, RightInfo, ShotTypeInfo)
11 11 
 from pre.custom_message import sendwxasubscribemessage
12 12 
 from utils.redis.rshot import update_member_shot_data
13 13 
 
@@ -103,6 +103,11 @@ class MemberActivityContributionInfoAdmin(admin.ModelAdmin):
103 103 
     list_filter = ('activity_id', 'content_type', 'is_audit_pass', 'is_selected', 'status')
104 104
105 105
106 
+class MemberActivityContributionWelfareInfoAdmin(admin.ModelAdmin):
107 
+    list_display = ('welfare_id', 'welfare_type', 'welfare_title', 'welfare_detail', 'welfare_value', 'welfare_image', 'status', 'created_at', 'updated_at')
108 
+    list_filter = ('welfare_type', 'status')
109 
+
110 
+
106 111 
 admin.site.register(GoodsInfo, GoodsInfoAdmin)
107 112 
 admin.site.register(GoodsOrderInfo, GoodsOrderInfoAdmin)
108 113 
 admin.site.register(RightInfo, RightInfoAdmin)
 
@@ -112,3 +117,4 @@ admin.site.register(MemberActivitySignupInfo, MemberActivitySignupInfoAdmin)
112 117 
 admin.site.register(MemberActivitySigninInfo, MemberActivitySigninInfoAdmin)
113 118 
 admin.site.register(MemberActivityGroupShareInfo, MemberActivityGroupShareInfoAdmin)
114 119 
 admin.site.register(MemberActivityContributionInfo, MemberActivityContributionInfoAdmin)
120 
+admin.site.register(MemberActivityContributionWelfareInfo, MemberActivityContributionWelfareInfoAdmin)

+ 43 - 0
member/migrations/0038_auto_20221025_0141.py
查看文件 

@@ -0,0 +1,43 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 3.2.16 on 2022-10-24 17:41
3 
+
4 
+from django.db import migrations, models
5 
+import django_models_ext.fileext
6 
+import shortuuidfield.fields
7 
+import simditor.fields
8 
+
9 
+
10 
+class Migration(migrations.Migration):
11 
+
12 
+    dependencies = [
13 
+        ('member', '0037_auto_20221023_2010'),
14 
+    ]
15 
+
16 
+    operations = [
17 
+        migrations.CreateModel(
18 
+            name='MemberActivityContributionWelfareInfo',
19 
+            fields=[
20 
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21 
+                ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),
22 
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
23 
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
24 
+                ('brand_id', models.CharField(blank=True, db_index=True, help_text='品牌唯一标识', max_length=32, null=True, verbose_name='brand_id')),
25 
+                ('brand_name', models.CharField(blank=True, help_text='品牌名称', max_length=255, null=True, verbose_name='brand_name')),
26 
+                ('welfare_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='福利唯一标识', max_length=22, null=True, unique=True)),
27 
+                ('welfare_type', models.IntegerField(choices=[(0, '实物'), (1, '积分'), (2, '虚拟')], db_index=True, default=0, help_text='福利类型', verbose_name='welfare_type')),
28 
+                ('welfare_title', models.CharField(blank=True, help_text='福利标题', max_length=255, null=True, verbose_name='welfare_title')),
29 
+                ('welfare_detail', simditor.fields.RichTextField(blank=True, help_text='福利详情', null=True, verbose_name='welfare_detail')),
30 
+                ('welfare_value', models.IntegerField(default=0, help_text='福利数量', verbose_name='welfare_value')),
31 
+                ('welfare_image', models.ImageField(blank=True, help_text='福利图片', null=True, upload_to=django_models_ext.fileext.upload_path, verbose_name='welfare_image')),
32 
+            ],
33 
+            options={
34 
+                'verbose_name': '会员活动投稿福利信息',
35 
+                'verbose_name_plural': '会员活动投稿福利信息',
36 
+            },
37 
+        ),
38 
+        migrations.AlterField(
39 
+            model_name='memberactivitycontributioninfo',
40 
+            name='content_type',
41 
+            field=models.IntegerField(choices=[(0, '投稿'), (1, '创作日记')], db_index=True, default=0, help_text='内容类型', verbose_name='content_type'),
42 
+        ),
43 
+    ]

+ 19 - 0
member/migrations/0039_memberactivitycontributionwelfareinfo_is_upload_qiniu.py
查看文件 

@@ -0,0 +1,19 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 3.2.16 on 2022-10-24 17:59
3 
+
4 
+from django.db import migrations, models
5 
+
6 
+
7 
+class Migration(migrations.Migration):
8 
+
9 
+    dependencies = [
10 
+        ('member', '0038_auto_20221025_0141'),
11 
+    ]
12 
+
13 
+    operations = [
14 
+        migrations.AddField(
15 
+            model_name='memberactivitycontributionwelfareinfo',
16 
+            name='is_upload_qiniu',
17 
+            field=models.BooleanField(default=False, help_text='是否已上传七牛', verbose_name='is_upload_qiniu'),
18 
+        ),
19 
+    ]

+ 50 - 0
member/models.py
查看文件 

@@ -718,3 +718,53 @@ class MemberActivityContributionInfo(BaseModelMixin):
718 718 
             'video_url': self.video_url or '',
719 719 
             'created_at': tc.local_string(utc_dt=self.created_at),
720 720 
         }
721 
+
722 
+
723 
+class MemberActivityContributionWelfareInfo(BaseModelMixin):
724 
+    WELFARE_TYPE = (
725 
+        (0, u'实物'),
726 
+        (1, u'积分'),
727 
+        (2, u'虚拟'),
728 
+    )
729 
+
730 
+    brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)
731 
+    brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')
732 
+
733 
+    welfare_id = ShortUUIDField(_(u'welfare_id'), max_length=32, blank=True, null=True, help_text=u'福利唯一标识', db_index=True, unique=True)
734 
+
735 
+    welfare_type = models.IntegerField(_(u'welfare_type'), choices=WELFARE_TYPE, default=0, help_text=u'福利类型', db_index=True)
736 
+
737 
+    welfare_title = models.CharField(_(u'welfare_title'), max_length=255, blank=True, null=True, help_text=u'福利标题')
738 
+    welfare_detail = RichTextField(_(u'welfare_detail'), blank=True, null=True, help_text=u'福利详情')
739 
+    welfare_value = models.IntegerField(_(u'welfare_value'), default=0, help_text=_(u'福利数量'))
740 
+    welfare_image = models.ImageField(_(u'welfare_image'), upload_to=upload_path, blank=True, null=True, help_text=u'福利图片')
741 
+
742 
+    is_upload_qiniu = models.BooleanField(_(u'is_upload_qiniu'), default=False, help_text=_(u'是否已上传七牛'))
743 
+
744 
+    class Meta:
745 
+        verbose_name = _(u'会员活动投稿福利信息')
746 
+        verbose_name_plural = _(u'会员活动投稿福利信息')
747 
+
748 
+    def __unicode__(self):
749 
+        return '%d' % self.pk
750 
+
751 
+    @property
752 
+    def welfare_image_path(self):
753 
+        return upload_file_path(self.welfare_image)
754 
+
755 
+    @property
756 
+    def welfare_image_url(self):
757 
+        return qiniu_file_url(self.welfare_image.name, bucket='tamron') if self.is_upload_qiniu else upload_file_url(self.welfare_image)
758 
+
759 
+    @property
760 
+    def data(self):
761 
+        return {
762 
+            'welfare_id': self.welfare_id,
763 
+            'welfare_type': self.welfare_type,
764 
+            'welfare_type_str': dict(MemberActivityContributionWelfareInfo.WELFARE_TYPE).get(self.welfare_type),
765 
+            'welfare_title': self.welfare_title,
766 
+            'welfare_detail': self.welfare_detail,
767 
+            'welfare_value': self.welfare_value,
768 
+            'welfare_image_url': self.welfare_image_url,
769 
+            'welfare_image_path': self.welfare_image_path,
770 
+        }