38595ff50168ae02fceca8bc0b1L189">189 189 
 # Kodo
190 190 
 urlpatterns += [
191 191 
     url(r'^login$', mch_views.login_api, name='login_api'),
192 
+    url(r'^admin/login$', mch_views.admin_login_api, name='admin_login_api'),
192 193 
 ]
193 194
194 195 
 urlpatterns += [
@@ -232,3 +233,10 @@ urlpatterns += [
232 233 
     url(r'^tj/consumer$', tj_views.tj_consumer, name='tj_consumer'),  # 统计数据(消费者维度)
233 234 
     url(r'^tj/generate$', tj_views.tj_generate, name='tj_generate'),  # 统计数据生成
234 235 
 ]
236 
+
237 
+urlpatterns += [
238 
+    url(r'^operator/add$', operator_views.operator_add, name='operator_add'),
239 
+    url(r'^operator/delete$', operator_views.operator_delete, name='operator_delete'),
240 
+    url(r'^operator/update$', operator_views.operator_update, name='operator_update'),
241 
+    url(r'^operator/list$', operator_views.operator_list, name='operator_list'),
242 
+]

+ 25 - 0
mch/migrations/0018_auto_20180514_1519.py
Bestand weergeven 

@@ -0,0 +1,25 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.11 on 2018-05-14 07:19
3 
+from __future__ import unicode_literals
4 
+
5 
+from django.db import migrations, models
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('mch', '0017_auto_20180508_1830'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterField(
16 
+            model_name='administratorinfo',
17 
+            name='user_status',
18 
+            field=models.IntegerField(choices=[(1, '\u5df2\u6fc0\u6d3b'), (2, '\u5df2\u7981\u7528'), (3, '\u5df2\u5220\u9664')], db_index=True, default=1, help_text='\u7ba1\u7406\u5458\u72b6\u6001', verbose_name='user_status'),
19 
+        ),
20 
+        migrations.AlterField(
21 
+            model_name='operatorinfo',
22 
+            name='user_status',
23 
+            field=models.IntegerField(choices=[(1, '\u5df2\u6fc0\u6d3b'), (2, '\u5df2\u7981\u7528'), (3, '\u5df2\u5220\u9664')], db_index=True, default=1, help_text='\u64cd\u4f5c\u5458\u72b6\u6001', verbose_name='user_status'),
24 
+        ),
25 
+    ]

+ 12 - 0
mch/models.py
Bestand weergeven 

@@ -9,10 +9,12 @@ from shortuuidfield import ShortUUIDField
9 9 
 class AdministratorInfo(BaseModelMixin):
10 10 
     ACTIVATED = 1
11 11 
     DISABLED = 2
12 
+    DELETED = 3
12 13
13 14 
     USER_STATUS_TUPLE = (
14 15 
         (ACTIVATED, u'已激活'),
15 16 
         (DISABLED, u'已禁用'),
17 
+        (DELETED, u'已删除'),
16 18 
     )
17 19
18 20 
     admin_id = ShortUUIDField(_(u'admin_id'), max_length=32, blank=True, null=True, help_text=u'管理员唯一标识', db_index=True, unique=True)
 
@@ -39,10 +41,12 @@ class AdministratorInfo(BaseModelMixin):
39 41 
 class OperatorInfo(BaseModelMixin):
40 42 
     ACTIVATED = 1
41 43 
     DISABLED = 2
44 
+    DELETED = 3
42 45
43 46 
     USER_STATUS_TUPLE = (
44 47 
         (ACTIVATED, u'已激活'),
45 48 
         (DISABLED, u'已禁用'),
49 
+        (DELETED, u'已删除'),
46 50 
     )
47 51
48 52 
     operator_id = ShortUUIDField(_(u'operator_id'), max_length=32, blank=True, null=True, help_text=u'操作员唯一标识', db_index=True, unique=True)
 
@@ -65,6 +69,14 @@ class OperatorInfo(BaseModelMixin):
65 69 
     def __unicode__(self):
66 70 
         return u'{}-{}'.format(self.name, self.phone)
67 71
72 
+    @property
73 
+    def data(self):
74 
+        return {
75 
+            'operator_id': self.operator_id,
76 
+            'phone': self.phone,
77 
+            'name': self.name,
78 
+        }
79 
+
68 80
69 81 
 class BrandInfo(BaseModelMixin):
70 82 
     brand_id = ShortUUIDField(_(u'brand_id'), max_length=32, help_text=u'品牌唯一标识', db_index=True, unique=True)

+ 21 - 4
utils/error/errno_utils.py
Bestand weergeven 

@@ -69,13 +69,30 @@ class TourGuideStatusCode(BaseStatusCode):
69 69 
     TOURGUIDE_NOT_ACTIVATED = StatusCodeField(400115, 'Tour Guide Not Activated', description=u'导游帐号未激活')
70 70
71 71
72 
-class OperatorStatusCode(BaseStatusCode):
72 
+class AdministratorStatusCode(BaseStatusCode):
73 73 
     """ 操作员相关错误码 4002xx """
74 
-    OPERATOR_NOT_FOUND = StatusCodeField(400201, 'Operator Not Found', description=u'操作员不存在')
74 
+    ADMINISTRATOR_NOT_FOUND = StatusCodeField(400201, 'Administrator Not Found', description=u'管理员不存在')
75 
+    # 密码
76 
+    ADMINISTRATOR_PASSWORD_ERROR = StatusCodeField(400202, 'Administrator Password Error', description=u'管理员密码错误')
77 
+    # 手机号
78 
+    ADMINISTRATOR_PHONE_ALREADY_EXISTS = StatusCodeField(400205, 'Administrator Phone Already Exists', description=u'管理员手机号已经存在')
79 
+    # 状态
80 
+    ADMINISTRATOR_NOT_ACTIVATED = StatusCodeField(400215, 'Administrator Not Activated', description=u'管理员未激活')
81 
+    ADMINISTRATOR_HAS_DISABLED = StatusCodeField(400216, 'Administrator Has Disabled', description=u'管理员已禁用')
82 
+    ADMINISTRATOR_HAS_DELETED = StatusCodeField(400217, 'Administrator Has Deleted', description=u'管理员已删除')
83 
+
84 
+
85 
+class OperatorStatusCode(BaseStatusCode):
86 
+    """ 操作员相关错误码 4003xx """
87 
+    OPERATOR_NOT_FOUND = StatusCodeField(400301, 'Operator Not Found', description=u'操作员不存在')
75 88 
     # 密码
76 
-    OPERATOR_PASSWORD_ERROR = StatusCodeField(400202, 'Operator Password Error', description=u'操作员密码错误')
89 
+    OPERATOR_PASSWORD_ERROR = StatusCodeField(400302, 'Operator Password Error', description=u'操作员密码错误')
90 
+    # 手机号
91 
+    OPERATOR_PHONE_ALREADY_EXISTS = StatusCodeField(400305, 'Operator Phone Already Exists', description=u'操作员手机号已经存在')
77 92 
     # 状态
78 
-    OPERATOR_NOT_ACTIVATED = StatusCodeField(400215, 'Operator Not Activated', description=u'操作员未激活')
93 
+    OPERATOR_NOT_ACTIVATED = StatusCodeField(400315, 'Operator Not Activated', description=u'操作员未激活')
94 
+    OPERATOR_HAS_DISABLED = StatusCodeField(400316, 'Operator Has Disabled', description=u'操作员已禁用')
95 
+    OPERATOR_HAS_DELETED = StatusCodeField(400317, 'Operator Has Deleted', description=u'操作员已删除')
79 96
80 97
81 98 
 class UserStatusCode(BaseStatusCode):

Kodo/kodo - Gogs: Go Git Service
Huis Verkennen Help
Registreer Inloggen
Kodo
/
kodo
Volgen 2
Ster 0
Vork 0
Kwesties 0 Pull-aanvragen 0 Commits 1557 Publicaties 0

36 Commits (8f76c30a1e3c8fdcf628c5b57a9548f6f2dbe59c)

Auteur SHA1 Bericht Datum
  huangqimin001 0a3d06d643 :art: Update member_activity 2 jaren geleden
  huangqimin001 020c5c128d :art: everyday_continue_send_user_coupon 3 jaren geleden
  huangqimin001 c01f5a3b5b :art: Add coupon_expire_at 3 jaren geleden
  FFIB 8dcde2c80c 销售员提交新增事务所和销售担当，以及经销商ID 4 jaren geleden
  FFIB 88b564d033 fix coercing to Unicode: need string or buffer, long found 4 jaren geleden
  huangqimin001 44c0a03bdc :art: Remove db_index=True for BooleanField 4 jaren geleden
  huangqimin001 91c6ab8593 :art: Remove unicode 4 jaren geleden
  FFIB 7b6bd253c6 调整时间格式，增加时分秒 4 jaren geleden
  huangqimin001 57be08ef32 :art: Codes Format 5 jaren geleden
  huangqimin001 9ec6e78a84 :art: image url 5 jaren geleden
  huangqimin001 c0c62380c9 Upload image qiniu 5 jaren geleden
  FFIB 575794412f Suport code_image relation 5 jaren geleden
  FFIB abbee931a9 Support /record/consumer、/record/sale and relation 5 jaren geleden
  FFIB 266238de56 add model_uni_name 5 jaren geleden
  FFIB d004d9fa5c SaleclerkSubmitLogInfo add model_uni_name 5 jaren geleden
  FFIB 4bc66d3c9c add qrcode version 5 jaren geleden
  FFIB 7657b9abc7 Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron 5 jaren geleden
  FFIB ea424acfcc add DateRangeFilter 5 jaren geleden
  huangqimin 3bbfc60c06 :art: Support del_clerk_sale_submit_api 5 jaren geleden
  FFIB 16e0cb2f1b SaleclerkSubmitLogInfo add iswxwork 5 jaren geleden
  FFIB 837d360998 saleclerkinfo 标识是否是网销。 5 jaren geleden
  FFIB afdc092d2d django 后台显示 has_scan 5 jaren geleden
  FFIB 5e717f152d 增加 has_scan 标记是否被消费者扫过。 5 jaren geleden
  Brightcells 8f7ce0fd0e New fields 5 jaren geleden
  Brightcells 7174017d52 sales 6 jaren geleden
  Brightcells 74f2a0cd6d testsn 6 jaren geleden
  Brightcells 3afae91835 Return model info for api clerk_integral_list_api 6 jaren geleden
  Brightcells e7dcf47e22 SaleclerkInfo 7 jaren geleden
  Brightcells 537c495621 Statistic 7 jaren geleden
  Brightcells cb207c5fcf Add field dupload for SaleclerkSubmitLogInfo 7 jaren geleden
  Brightcells e47aa7f8c4 Add field test_user 7 jaren geleden
  Brightcells b2c1f2b217 Return created_at 7 jaren geleden
  Brightcells df63cfed08 Add clerk integral list api 7 jaren geleden
  Brightcells 018d52f61d Update package django_xxx 7 jaren geleden
  Brightcells 2bac598d19 Clerk Sale Submit 7 jaren geleden
  Brightcells 627187a7d7 Update Kodo 7 jaren geleden