consumer_snlist_api
Brightcells
3 измененных файлов с 46 добавлено и 0 удалено
+ 20
- 0
api/mch_views.py
@@ -357,3 +357,23 @@ def consumer_info_api(request): |
||
| 357 | 357 |
# pssi2.save() |
| 358 | 358 |
|
| 359 | 359 |
return response(200, 'Submit Consumer Info Success', u'提交消费者信息成功') |
| 360 |
+ |
|
| 361 |
+ |
|
| 362 |
+@logit(res=True) |
|
| 363 |
+@transaction.atomic |
|
| 364 |
+def consumer_snlist_api(request): |
|
| 365 |
+ user_id = request.POST.get('user_id', '')
|
|
| 366 |
+ |
|
| 367 |
+ # 校验用户是否存在 |
|
| 368 |
+ try: |
|
| 369 |
+ user = UserInfo.objects.get(user_id=user_id) |
|
| 370 |
+ except UserInfo.DoesNotExist: |
|
| 371 |
+ return response(UserStatusCode.USER_NOT_FOUND) |
|
| 372 |
+ |
|
| 373 |
+ # 用户信息提交列表 |
|
| 374 |
+ logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=user_id, status=True) |
|
| 375 |
+ logs = [log.data for log in logs] |
|
| 376 |
+ |
|
| 377 |
+ return response(200, 'Get Consumer Submit List Success', u'获取消费者提交列表成功', {
|
|
| 378 |
+ 'logs': logs, |
|
| 379 |
+ }) |
+ 1
- 0
api/urls.py
@@ -216,6 +216,7 @@ urlpatterns += [ |
||
| 216 | 216 |
urlpatterns += [ |
| 217 | 217 |
url(r'^consumer_phone$', mch_views.consumer_phone_api, name='consumer_phone_api'), |
| 218 | 218 |
url(r'^consumer_info$', mch_views.consumer_info_api, name='consumer_info_api'), |
| 219 |
+ url(r'^consumer_snlist$', mch_views.consumer_snlist_api, name='consumer_snlist_api'), |
|
| 219 | 220 |
] |
| 220 | 221 |
|
| 221 | 222 |
urlpatterns += [ |
+ 25
- 0
mch/models.py
@@ -190,6 +190,7 @@ class ModelInfo(BaseModelMixin): |
||
| 190 | 190 |
'model_name': self.model_name, |
| 191 | 191 |
'model_uni_name': self.model_uni_name, |
| 192 | 192 |
'model_full_name': self.model_full_name, |
| 193 |
+ 'model_descr': self.model_descr, |
|
| 193 | 194 |
'category': self.category, |
| 194 | 195 |
'warehouse': self.warehouse, |
| 195 | 196 |
'image_path': self.image_path, |
@@ -198,6 +199,8 @@ class ModelInfo(BaseModelMixin): |
||
| 198 | 199 |
'integral': self.integral, |
| 199 | 200 |
} |
| 200 | 201 |
|
| 202 |
+ fulldata = admindata |
|
| 203 |
+ |
|
| 201 | 204 |
|
| 202 | 205 |
class ModelImageInfo(BaseModelMixin): |
| 203 | 206 |
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): |
||
| 475 | 478 |
|
| 476 | 479 |
def __unicode__(self): |
| 477 | 480 |
return unicode(self.pk) |
| 481 |
+ |
|
| 482 |
+ @property |
|
| 483 |
+ def model_info(self): |
|
| 484 |
+ try: |
|
| 485 |
+ info = ModelInfo.objects.get(model_id=self.model_id).fulldata |
|
| 486 |
+ except ModelInfo.DoesNotExist: |
|
| 487 |
+ info = {}
|
|
| 488 |
+ return info |
|
| 489 |
+ |
|
| 490 |
+ @property |
|
| 491 |
+ def data(self): |
|
| 492 |
+ return {
|
|
| 493 |
+ 'lat': self.lat, |
|
| 494 |
+ 'lon': self.lon, |
|
| 495 |
+ 'brand_id': self.brand_id, |
|
| 496 |
+ 'brand_name': self.brand_name, |
|
| 497 |
+ 'model_id': self.model_id, |
|
| 498 |
+ 'model_name': self.model_name, |
|
| 499 |
+ 'model_info': self.model_info, |
|
| 500 |
+ 'serialNo': self.serialNo, |
|
| 501 |
+ 'verifyResult': self.verifyResult, |
|
| 502 |
+ } |