remove to_lid
Brightcells
4 mainītis faili ar 20 papildinājumiem un 4 dzēšanām
+ 1
- 1
pay/admin.py
@@ -6,7 +6,7 @@ from pay.models import OrderInfo |
||
| 6 | 6 |
|
| 7 | 7 |
|
| 8 | 8 |
class OrderInfoAdmin(admin.ModelAdmin): |
| 9 |
- list_display = ('order_id', 'from_uid', 'to_lid', 'to_uid', 'pay_status', 'paid_at', 'status', 'created_at', 'updated_at')
|
|
| 9 |
+ list_display = ('order_id', 'from_uid', 'to_uid', 'pay_status', 'paid_at', 'status', 'created_at', 'updated_at')
|
|
| 10 | 10 |
list_filter = ('pay_status', 'status')
|
| 11 | 11 |
|
| 12 | 12 |
|
+ 18
- 0
pay/migrations/0005_remove_orderinfo_to_lid.py
@@ -0,0 +1,18 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+from __future__ import unicode_literals |
|
| 3 |
+ |
|
| 4 |
+from django.db import models, migrations |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('pay', '0004_auto_20160422_1322'),
|
|
| 11 |
+ ] |
|
| 12 |
+ |
|
| 13 |
+ operations = [ |
|
| 14 |
+ migrations.RemoveField( |
|
| 15 |
+ model_name='orderinfo', |
|
| 16 |
+ name='to_lid', |
|
| 17 |
+ ), |
|
| 18 |
+ ] |
+ 0
- 2
pay/models.py
@@ -50,7 +50,6 @@ class OrderInfo(CreateUpdateMixin): |
||
| 50 | 50 |
photo_type = models.IntegerField(_('photo_type'), choices=PHOTO_TYPE, default=NOMARK, help_text=u'购买照片类型')
|
| 51 | 51 |
|
| 52 | 52 |
from_uid = models.CharField(_(u'from_uid'), max_length=255, help_text=u'付款用户唯一标识', db_index=True) |
| 53 |
- to_lid = models.CharField(_(u'to_lid'), max_length=255, blank=True, null=True, help_text=u'收款摄影师唯一标识', db_index=True) |
|
| 54 | 53 |
to_uid = models.CharField(_(u'to_uid'), max_length=255, blank=True, null=True, help_text=u'收款用户唯一标识', db_index=True) |
| 55 | 54 |
|
| 56 | 55 |
body = models.CharField(_(u'body'), max_length=255, blank=True, null=True, help_text=u'商品描述') |
@@ -79,7 +78,6 @@ class OrderInfo(CreateUpdateMixin): |
||
| 79 | 78 |
'group_id': self.group_id, |
| 80 | 79 |
'photo_id': self.photo_id, |
| 81 | 80 |
'group_photo_info': group_photo and group_photo.photo_info(user_id), |
| 82 |
- 'to_lid': self.to_lid, |
|
| 83 | 81 |
'to_uid': self.to_uid, |
| 84 | 82 |
'body': self.body, |
| 85 | 83 |
'total_fee': self.total_fee, |
+ 1
- 1
pay/views.py
@@ -239,7 +239,7 @@ def wx_order_detail_api(request): |
||
| 239 | 239 |
except OrderInfo.DoesNotExist: |
| 240 | 240 |
return response(OrderStatusCode.WX_ORDER_NOT_FOUND) |
| 241 | 241 |
|
| 242 |
- if user_id not in [order.from_uid, order.to_lid, order.to_uid]: |
|
| 242 |
+ if user_id not in [order.from_uid, order.to_uid]: |
|
| 243 | 243 |
return response(OrderStatusCode.NO_DETAIL_PERMISSION) |
| 244 | 244 |
|
| 245 | 245 |
return response(200, 'Get Order Detail Success', u'获取订单详情成功') |