td class="lines-num lines-num-new"> 20
21 21

+ 25 - 0
integral/migrations/0004_auto_20180417_1031.py
Преглед на файла 

@@ -0,0 +1,25 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.11 on 2018-04-17 02:31
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 
+        ('integral', '0003_auto_20180402_1904'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AddField(
16 
+            model_name='saleclerkintegralincomeexpensesinfo',
17 
+            name='test_user',
18 
+            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
19 
+        ),
20 
+        migrations.AddField(
21 
+            model_name='saleclerksubmitloginfo',
22 
+            name='test_user',
23 
+            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
24 
+        ),
25 
+    ]

+ 4 - 0
integral/models.py
Преглед на файла 

@@ -39,6 +39,8 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):
39 39
40 40 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
41 41
42 
+    test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
43 
+
42 44 
     class Meta:
43 45 
         verbose_name = _(u'saleclerkintegralincomeexpensesinfo')
44 46 
         verbose_name_plural = _(u'saleclerkintegralincomeexpensesinfo')
 
@@ -73,6 +75,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):
73 75
74 76 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
75 77
78 
+    test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
79 
+
76 80 
     class Meta:
77 81 
         verbose_name = _(u'saleclerksubmitloginfo')
78 82 
         verbose_name_plural = _(u'saleclerksubmitloginfo')

+ 20 - 0
mch/migrations/0013_consumeinfosubmitloginfo_test_user.py
Преглед на файла 

@@ -0,0 +1,20 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.11 on 2018-04-17 02:31
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', '0012_auto_20180401_2012'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AddField(
16 
+            model_name='consumeinfosubmitloginfo',
17 
+            name='test_user',
18 
+            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
19 
+        ),
20 
+    ]

+ 2 - 0
mch/models.py
Преглед на файла 

@@ -223,6 +223,8 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):
223 223
224 224 
     verifyResult = models.IntegerField(_(u'verifyResult'), default=0, help_text=u'验证结果')
225 225
226 
+    test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
227 
+
226 228 
     class Meta:
227 229 
         verbose_name = _(u'消费者信息提交记录')
228 230 
         verbose_name_plural = _(u'消费者信息提交记录')

+ 3 - 0
page/sale_views.py
Преглед на файла 

@@ -70,6 +70,7 @@ def clerk_sale_submit_api(request):
70 70 
         lat=lat,
71 71 
         lon=lon,
72 72 
         image=file_path,
73 
+        test_user=clerk.test_user,
73 74 
     )
74 75
75 76 
     if SaleclerkIntegralIncomeExpensesInfo.objects.filter(code=serialNo, status=True).exists():
 
@@ -103,6 +104,7 @@ def clerk_sale_submit_api(request):
103 104 
         image=file_path,
104 105 
         integral=integral,
105 106 
         left_integral=clerk.total_integral,
107 
+        test_user=clerk.test_user,
106 108 
     )
107 109
108 110 
     return response(200, data={
 
@@ -221,6 +223,7 @@ def clerk_sale_submit_api_bak(request):
221 223 
         code=code,
222 224 
         integral=product.integral,
223 225 
         left_integral=clerk.integral,
226 
+        test_user=clerk.test_user,
224 227 
     )
225 228
226 229 
     return response(200, 'Submit Success', u'提交成功', {})

+ 1 - 1
requirements.txt
Преглед на файла 

@@ -24,7 +24,7 @@ django-rlog==1.0.7
24 24 
 django-shortuuidfield==0.1.3
25 25 
 django-six==1.0.4
26 26 
 django-uniapi==1.0.1
27 
-django-we==1.2.1
27 
+django-we==1.2.3
28 28 
 djangorestframework==3.7.7
29 29 
 furl==1.0.1
30 30 
 hiredis==0.2.0

pai2 - Gogs: Go Git Service
Главная Обзор Помощь
Зарегистрироваться Войти
Pai2
/
pai2
Следить 2
В избранное 0
Ответвить 0
Обсуждения 0 Пулл реквесты 0 Коммиты 567 Релизы 0

拍爱

ZIP TAR.GZ
Brightcells: 1ddb115c57 list_display лет %!s(int64=8): %!d(string=назад)
..
migrations e04f95dc5e long => lon лет %!s(int64=8): %!d(string=назад)
__init__.py aa31a5f59a Add kodo лет %!s(int64=8): %!d(string=назад)
admin.py 1ddb115c57 list_display лет %!s(int64=8): %!d(string=назад)
apps.py aa31a5f59a Add kodo лет %!s(int64=8): %!d(string=назад)
models.py e04f95dc5e long => lon лет %!s(int64=8): %!d(string=назад)
tests.py aa31a5f59a Add kodo лет %!s(int64=8): %!d(string=назад)
views.py aa31a5f59a Add kodo лет %!s(int64=8): %!d(string=назад)