api/encrypt_views.py

@@ -144,4 +144,5 @@ def decrypt(request):

                         'has_unexpired_activity': has_unexpired_activity,
              

                         'coupon_info': coupon_info,
              

                         'redpack_info': elog.redpack_info if elog else {},
              

                +        'integral': model.integral,
              

                     })
              

mch/models.py

@@ -110,6 +110,8 @@ class BrandInfo(BaseModelMixin):

                     brand_logo = models.ImageField(_(u'brand_logo'), upload_to=upload_path, blank=True, null=True, help_text=u'品牌商标')
              

                     brand_domain = models.CharField(_(u'brand_domain'), max_length=255, blank=True, null=True, help_text=u'品牌域名')
              

                 
              

                +    clerk_direct_submit = models.BooleanField(_(u'clerk_direct_submit'), default=False, help_text=u'销售员直接提交')
              

                +
              

                     position = models.IntegerField(_(u'position'), default=1, help_text=u'排序')
              

                 
              

                     class Meta:
              

page/sale_views.py

@@ -9,6 +9,7 @@ from django_response import response

                 from paginator import pagination
              

                 from TimeConvert import TimeConvert as tc
              

                 
              

                +from api.encrypt_views import decrypt
              

                 from account.models import UserInfo
              

                 from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              
@@ -63,6 +64,9 @@ def clerk_sale_decrypt_api(request):

                     if brand and brand.brand_id != brand_id:
              

                         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
              

                 
              

                +    if not brand.clerk_direct_submit:
              

                +        return decrypt(request)
              

                +
              

                     try:
              

                         model = ModelInfo.objects.get(pk=model_pk)
              

                     except ModelInfo.DoesNotExist: