api/mch_views.py

@@ -357,3 +357,23 @@ def consumer_info_api(request):

                             # pssi2.save()
              

                 
              

                     return response(200, 'Submit Consumer Info Success', u'提交消费者信息成功')
              

                +
              

                +
              

                +@logit(res=True)
              

                +@transaction.atomic
              

                +def consumer_snlist_api(request):
              

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

                +
              

                +    # 校验用户是否存在
              

                +    try:
              

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

                +    except UserInfo.DoesNotExist:
              

                +        return response(UserStatusCode.USER_NOT_FOUND)
              

                +
              

                +    # 用户信息提交列表
              

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

                +    logs = [log.data for log in logs]
              

                +
              

                +    return response(200, 'Get Consumer Submit List Success', u'获取消费者提交列表成功', {
              

                +        'logs': logs,
              

                +    })
              

api/urls.py

@@ -216,6 +216,7 @@ urlpatterns += [

                 urlpatterns += [
              

                     url(r'^consumer_phone$', mch_views.consumer_phone_api, name='consumer_phone_api'),
              

                     url(r'^consumer_info$', mch_views.consumer_info_api, name='consumer_info_api'),
              

                +    url(r'^consumer_snlist$', mch_views.consumer_snlist_api, name='consumer_snlist_api'),
              

                 ]
              

                 
              

                 urlpatterns += [
              

mch/models.py

@@ -190,6 +190,7 @@ class ModelInfo(BaseModelMixin):

                             'model_name': self.model_name,
              

                             'model_uni_name': self.model_uni_name,
              

                             'model_full_name': self.model_full_name,
              

                +            'model_descr': self.model_descr,
              

                             'category': self.category,
              

                             'warehouse': self.warehouse,
              

                             'image_path': self.image_path,
              
@@ -198,6 +199,8 @@ class ModelInfo(BaseModelMixin):

                             'integral': self.integral,
              

                         }
              

                 
              

                +    fulldata = admindata
              

                +
              

                 
              

                 class ModelImageInfo(BaseModelMixin):
              

                     model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)
              
@@ -475,3 +478,25 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):

                 
              

                     def __unicode__(self):
              

                         return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def model_info(self):
              

                +        try:
              

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

                +        except ModelInfo.DoesNotExist:
              

                +            info = {}
              

                +        return info
              

                +
              

                +    @property
              

                +    def data(self):
              

                +        return {
              

                +            'lat': self.lat,
              

                +            'lon': self.lon,
              

                +            'brand_id': self.brand_id,
              

                +            'brand_name': self.brand_name,
              

                +            'model_id': self.model_id,
              

                +            'model_name': self.model_name,
              

                +            'model_info': self.model_info,
              

                +            'serialNo': self.serialNo,
              

                +            'verifyResult': self.verifyResult,
              

                +        }