api/consumer_admin_view.py

@@ -7,8 +7,11 @@ from paginator import pagination

                 from django.db import transaction
              

                 from django.db.models import Q
              

                 from django_logit import logit
              

                +from django_response import response
              

                +from TimeConvert import TimeConvert as tc
              

                 
              

                 from kodo.decorators import check_admin
              

                +from account.models import UserInfo
              

                 from mch.models import AdministratorInfo, ConsumeShotUnbindingInfo
              

                 
              

                 
              
@@ -18,21 +21,35 @@ def consumer_shot_unbinding_list(request, administrator):

                     start_time = request.POST.get('start_time', '')
              

                     end_time = request.POST.get('end_time', '')
              

                     query = request.POST.get('query', '')
              

                +    model_id = request.POST.get('model_id', '')
              

                +    page = request.POST.get('page', 1)
              

                +    num = request.POST.get('num', 20)
              

                 
              

                -    unbindings = ConsumeShotUnbindingInfo.objects.filter(Q(phone__icontains=query) | Q(sn__icontains=query), status=True)
              

                +    unbindings = ConsumeShotUnbindingInfo.objects.filter(status=True).order_by('-created_at')
              

                +
              

                +    if query:
              

                +        user_id = ''
              

                +        try:
              

                +            user_id = UserInfo.objects.get(phone__icontains=query, status=True)
              

                +        except UserInfo.DoesNotExist:
              

                +            pass
              

                +        unbindings = unbindings.filter(Q(sn__icontains=query) | Q(user_id=user_id))
              

                 
              

                     if start_time and end_time:
              

                         start_time = tc.string_to_utc_datetime(start_time, format='%Y%m%d')
              

                         end_time = tc.string_to_utc_datetime(end_time + ' 23:59:59', format='%Y%m%d %H:%M:%S')
              

                         unbindings = unbindings.filter(created_at__range=(start_time, end_time))
              

                 
              

                +    if model_id:
              

                +        unbindings = unbindings.filter(model_id=model_id)
              

                +
              

                     count = unbindings.count()
              

                 
              

                     unbindings, left = pagination(unbindings, page, num)
              

                     unbindings = [unbinding.admindata for unbinding in unbindings]
              

                 
              

                -    return response(200, 'Get Cosumer Shot Unbinding List Success', u'用户列表获取成功', data={
              

                -        'unbinding': userinfos,
              

                +    return response(200, 'Get Cosumer Shot Unbinding List Success', u'消费者镜头解绑列表获取成功', data={
              

                +        'unbindings': unbindings,
              

                         'count': count,
              

                         'left': left
              

                     })
              

api/mch_views.py

@@ -500,7 +500,7 @@ def consumer_snlist_api(request):

                         return response(UserStatusCode.USER_NOT_FOUND)
              

                 
              

                     # 用户信息提交列表
              

                -    logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, status=True).distinct()
              

                +    logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, status=True).distinct().order_by('-created_at')
              

                     seen = set()
              

                     seen_add = seen.add
              

                     logs = [log.data for log in logs if not ((log.serialNo, log.model_name) in seen or seen_add((log.serialNo, log.model_name)))]
              

api/staff_views.py

@@ -302,6 +302,9 @@ def exec_del_consumer_submit(pk, admin_id):

                         code=ssli.serialNo
              

                     )
              

                 
              

                +    if ssli.unbound:
              

                +        return response()
              

                +
              

                     # 消除用户劵
              

                     if user.shots_num <= 5:
              

                         rights = RightInfo.objects.filter(is_send_coupon=True, status=True)
              

mch/models.py

@@ -841,7 +841,7 @@ class ConsumeShotUnbindingInfo(BaseModelMixin, BrandInfoMixin):

                     def admindata(self):
              

                         from account.models import UserInfo
              

                 
              

                -        info = ModelInfo.objects.get(model_id=self.model_id).fulldata
              

                +        model_info = ModelInfo.objects.get(model_id=self.model_id).fulldata
              

                         user = UserInfo.objects.get(user_id=self.user_id)
              

                 
              

                         return {
              
@@ -851,8 +851,8 @@ class ConsumeShotUnbindingInfo(BaseModelMixin, BrandInfoMixin):

                             'sn': self.sn,
              

                             'reason': self.reason,
              

                             'submit_pk': self.submit_pk,
              

                -            'submit_at': self.submit_at,
              

                -            'created_at': self.created_at,
              

                +            'submit_at': tc.local_string(utc_dt=self.submit_at, format='%Y-%m-%d %H:%M'),
              

                +            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M'),
              

                         }