integral/admin.py

@@ -14,8 +14,8 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd

                 
              

                 
              

                 class SaleclerkSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('franchiser_id', 'clerk_id', 'code', 'remark', 'test_user', 'status', 'created_at', 'updated_at')
              

                -    list_filter = ('franchiser_id', 'test_user', 'status')
              

                +    list_display = ('franchiser_id', 'clerk_id', 'code', 'remark', 'dupload', 'test_user', 'status', 'created_at', 'updated_at')
              

                +    list_filter = ('franchiser_id', 'dupload', 'test_user', 'status')
              

                     search_fields = ('code', 'remark')
              

                 
              

                 
              

integral/migrations/0005_saleclerksubmitloginfo_dupload.py

@@ -0,0 +1,20 @@

                +# -*- coding: utf-8 -*-
              

                +# Generated by Django 1.11.11 on 2018-04-18 03:22
              

                +from __future__ import unicode_literals
              

                +
              

                +from django.db import migrations, models
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('integral', '0004_auto_20180417_1031'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AddField(
              

                +            model_name='saleclerksubmitloginfo',
              

                +            name='dupload',
              

                +            field=models.BooleanField(db_index=True, default=False, help_text='\u662f\u5426\u4e3a\u91cd\u590d\u63d0\u4ea4', verbose_name='dupload'),
              

                +        ),
              

                +    ]
              

integral/models.py

@@ -75,6 +75,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):

                 
              

                     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
              

                 
              

                +    dupload = models.BooleanField(_(u'dupload'), default=False, help_text=_(u'是否为重复提交'), db_index=True)
              

                +
              

                     test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
              

                 
              

                     class Meta:
              

page/sale_views.py

@@ -9,7 +9,7 @@ from django_logit import logit

                 from django_response import response
              

                 from paginator import pagination
              

                 
              

                -from account.models import FranchiserInfo, SaleclerkInfo, UserInfo
              

                +from account.models import SaleclerkInfo, UserInfo
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              

                 from mch.models import ModelInfo
              

                 from product.models import ProductCodeSubmitLogInfo, ProductInfo, ProductModelInfo
              
@@ -61,7 +61,7 @@ def clerk_sale_submit_api(request):

                         return response(SaleclerkStatusCode.CLERK_NOT_FOUND)
              

                 
              

                     # 店员提交记录
              

                -    SaleclerkSubmitLogInfo.objects.create(
              

                +    ssli = SaleclerkSubmitLogInfo.objects.create(
              

                         franchiser_id=clerk.franchiser_id,
              

                         clerk_id=clerk.clerk_id,
              

                         code=serialNo,
              
@@ -79,10 +79,14 @@ def clerk_sale_submit_api(request):

                         sci = None
              

                 
              

                     if sci:
              

                +        ssli.dupload = True
              

                +        ssli.save()
              

                +
              

                         try:
              

                             clerk = SaleclerkInfo.objects.get(clerk_id=sci.clerk_id, status=True)
              

                         except SaleclerkInfo.DoesNotExist:
              

                             clerk = None
              

                +
              

                         return response(SaleclerkStatusCode.DUPLICATE_SUBMIT, data={
              

                             'franchiser_name': clerk.franchiser_name,
              

                             'clerk_name': clerk.clerk_name,
              

requirements.txt

@@ -5,7 +5,7 @@ Pillow==5.0.0

                 StatusCode==1.0.0
              

                 TimeConvert==1.4.3
              

                 cryptography==1.5.2
              

                -django-admin==1.2.3
              

                +django-admin==1.2.4
              

                 django-curtail-uuid==1.0.4
              

                 django-detect==1.0.5
              

                 django-file-md5==1.0.2
              
@@ -24,7 +24,7 @@ django-rlog==1.0.7

                 django-shortuuidfield==0.1.3
              

                 django-six==1.0.4
              

                 django-uniapi==1.0.1
              

                -django-we==1.2.3
              

                +django-we==1.2.9
              

                 djangorestframework==3.7.7
              

                 furl==1.0.1
              

                 hiredis==0.2.0