api/mch_views.py

@@ -12,10 +12,10 @@ from pywe_storage import RedisStorage

                 from TimeConvert import TimeConvert as tc
              

                 
              

                 from account.models import UserInfo
              

                +from integral.models import SaleclerkSubmitLogInfo
              

                 from mch.models import (ActivityInfo, AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo,
              

                                         LatestAppInfo, LatestAppScreenInfo, ModelInfo, OperatorInfo)
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              

                -from integral.models import SaleclerkSubmitLogInfo
              

                 from utils.error.errno_utils import (AdministratorStatusCode, OperatorStatusCode, ProductBrandStatusCode,
              

                                                      ProductModelStatusCode, UserStatusCode)
              

                 from utils.redis.connect import r
              
@@ -392,7 +392,7 @@ def consumer_info_api(request):

                             'ymd': ymd,
              

                         })
              

                 
              

                -    #更新销售员提交的表
              

                +    # 更新销售员提交的表
              

                     logs = SaleclerkSubmitLogInfo.objects.filter(code=serialNo, model_pk=model.pk)
              

                     for log in logs:
              

                         log.has_scan = True
              

api/urls.py

@@ -226,7 +226,7 @@ urlpatterns += [

                     url(r'^clerk/sale/submit$', sale_views.clerk_sale_submit_api, name='clerk_sale_submit'),  # 店员销售信息提交
              

                     url(r'^clerk/integral/list$', sale_views.clerk_integral_list_api, name='clerk_integral_list_api'),  # 店员销售积分列表
              

                     url(r'^clerk/model/list$', sale_views.clerk_model_list_api, name='clerk_model_list_api'),
              

                -    url(r'^clerk/checkout/serialNo$', sale_views.clerk_checkout_serialNo_api, name='clerk_checkout_serialNo_api'), #校验序列号
              

                +    url(r'^clerk/checkout/serialNo$', sale_views.clerk_checkout_serialNo_api, name='clerk_checkout_serialNo_api'),  # 校验序列号
              

                 ]
              

                 
              

                 urlpatterns += [
              

integral/admin.py

@@ -15,7 +15,7 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd

                 
              

                 class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):
              

                     list_display = ('brand_pk', 'brand_name', 'model_pk', 'model_name', 'distributor_pk', 'distributor_name', 'clerk_id', 'clerk_name', 'code', 'remark', 'dupload', 'test_user', 'test_sn', 'ym', 'ymd', 'status', 'has_scan', 'trackingNo', 'created_at', 'updated_at')
              

                -    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn','has_scan', 'status')
              

                +    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'has_scan', 'status')
              

                     search_fields = ('code', 'remark')
              

                 
              

                 
              

page/sale_views.py

@@ -11,12 +11,12 @@ from TimeConvert import TimeConvert as tc

                 
              

                 from account.models import UserInfo
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              

                -from mch.models import BrandInfo, DistributorInfo, ModelInfo, SaleclerkInfo, ConsumeInfoSubmitLogInfo
              

                +from logs.models import MchInfoEncryptLogInfo
              

                +from mch.models import BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo, SaleclerkInfo
              

                 from statistic.models import (DistributorSaleStatisticInfo, ModelSaleStatisticInfo, ProvinceSaleStatisticInfo,
              

                                               SaleclerkSaleStatisticInfo, SaleStatisticInfo)
              

                -from utils.error.errno_utils import (ProductBrandStatusCode, ProductDistributorStatusCode, ProductModelStatusCode,
              

                -                                     SaleclerkStatusCode)
              

                -from logs.models import MchInfoEncryptLogInfo
              

                +from utils.error.errno_utils import (ProductBrandStatusCode, ProductDistributorStatusCode, ProductMachineStatusCode,
              

                +                                     ProductModelStatusCode, SaleclerkStatusCode)
              

                 
              

                 
              

                 @logit
              
@@ -91,11 +91,11 @@ def clerk_sale_submit_api(request):

                     if trackingNo:
              

                         is_exist = SaleclerkSubmitLogInfo.objects.filter(trackingNo=trackingNo, status=True).exists()
              

                         if is_exist:
              

                -            return response(SaleclerkStatusCode.DUPLICATE_TRACKING_NUMBER)
              

                +            return response(ProductMachineStatusCode.DUPLICATE_TRACKING_NUMBER)
              

                 
              

                     ymd = tc.local_string(format='%Y%m%d')
              

                 
              

                -    #是否被消费者扫过
              

                +    # 是否被消费者扫过
              

                     has_scan = ConsumeInfoSubmitLogInfo.objects.filter(
              

                         model_id=model.model_id,
              

                         serialNo=serialNo).exists()
              
@@ -408,6 +408,7 @@ def clerk_model_list_api(request):

                         'models': models,
              

                     })
              

                 
              

                +
              

                 @logit
              

                 def clerk_checkout_serialNo_api(request):
              

                     brandID = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_PK)
              
@@ -441,6 +442,6 @@ def clerk_checkout_serialNo_api(request):

                     try:
              

                         log = MchInfoEncryptLogInfo.objects.get(model_pk=model_pk, sn=serialNo)
              

                     except MchInfoEncryptLogInfo.DoesNotExist:
              

                -        return response(SaleclerkStatusCode.SERIALNO_NOT_FOUND)
              

                +        return response(ProductMachineStatusCode.SN_NOT_FOUND)
              

                 
              

                     return response(200, 'SerialNo Checkout Success', u'序列号校验成功')
              

requirements_pywe.txt

@@ -7,5 +7,5 @@ pywe-oauth==1.0.7

                 pywe-pay==1.0.12
              

                 pywe-pay-notify==1.0.4
              

                 pywe-response==1.0.1
              

                -pywe-sign==1.0.8
              

                +pywe-sign==1.1.0
              

                 pywe-xml==1.0.6
              

utils/error/errno_utils.py

@@ -15,12 +15,6 @@ class SaleclerkStatusCode(BaseStatusCode):

                     # 上传
              

                     DUPLICATE_SUBMIT = StatusCodeField(500199, 'Duplicate Submit', description=u'重复提交')
              

                 
              

                -    #序列号校验
              

                -    SERIALNO_NOT_FOUND = StatusCodeField(500200, 'SerialNo Not Found', description=u'序列号不存在')
              

                -
              

                -    #快递单号校验
              

                -    DUPLICATE_TRACKING_NUMBER = StatusCodeField(500198, 'Duplicate Tracking Number', description=u'快递单号重复')
              

                -
              

                 
              

                 class SalesResponsibilityStatusCode(BaseStatusCode):
              

                     """ 销售担当相关错误码 5002xx """
              
@@ -49,6 +43,9 @@ class ProductMachineStatusCode(BaseStatusCode):

                     """ 机器相关错误码 5013xx """
              

                     SN_NOT_FOUND = StatusCodeField(501301, 'SN Not Found', description=u'序列号不存在')
              

                 
              

                +    # 快递单号校验
              

                +    DUPLICATE_TRACKING_NUMBER = StatusCodeField(501311, 'Duplicate Tracking Number', description=u'快递单号重复')
              

                +
              

                 
              

                 class ProductCouponStatusCode(BaseStatusCode):
              

                     """ 优惠券相关错误码 5014xx """