| @@ -213,6 +213,7 @@ def good_exchange(request): | ||
| 213 | 213 | name=name, | 
| 214 | 214 | phone=phone, | 
| 215 | 215 | address=address, | 
| 216 | + integral=good.integral, | |
| 216 | 217 | ) | 
| 217 | 218 |  | 
| 218 | 219 | if good.good_type == GoodsInfo.PHYSICAL: | 
| @@ -14,7 +14,7 @@ class GoodsInfoAdmin(admin.ModelAdmin): | ||
| 14 | 14 |  | 
| 15 | 15 |  | 
| 16 | 16 | class GoodsOrderInfoAdmin(admin.ModelAdmin): | 
| 17 | -    list_display = ('order_id', 'user_id', 'good_id', 'good_type', 'title', 'name', 'phone', 'address', 'tracking_number', 'has_send_template_message', 'status', 'created_at', 'updated_at') | |
| 17 | +    list_display = ('order_id', 'user_id', 'good_id', 'good_type', 'title', 'name', 'phone', 'address', 'tracking_number', 'has_send_template_message', 'integral', 'status', 'created_at', 'updated_at') | |
| 18 | 18 |      list_filter = ('good_type', 'status') | 
| 19 | 19 |  | 
| 20 | 20 | def save_model(self, request, obj, form, change): | 
| @@ -127,6 +127,8 @@ class GoodsOrderInfo(BaseModelMixin): | ||
| 127 | 127 |  | 
| 128 | 128 | tracking_number = models.CharField(_(u'tracking_number'), max_length=255, blank=True, null=True, help_text=u'快递单号') | 
| 129 | 129 |  | 
| 130 | + integral = models.IntegerField(_(u'integral'), default=99999, help_text=u'兑换所需积分') | |
| 131 | + | |
| 130 | 132 | has_send_template_message = models.BooleanField(_(u'has_send_template_message'), default=True, help_text=u'是否已发送模版消息', db_index=True) | 
| 131 | 133 |  | 
| 132 | 134 | class Meta: |