pay/models.py

@@ -43,12 +43,14 @@ class OrderInfo(BaseModelMixin):

                     PAID = 1
              

                     FAIL = 2
              

                     # DELETED = 9
              

                +    CANCELED = 10
              

                 
              

                     PAY_STATUS = (
              

                         (WAITING_PAY, u'待支付'),
              

                         (PAID, u'已支付'),
              

                         (FAIL, u'已失败'),
              

                         # (DELETED, u'已删除'),
              

                +        (CANCELED, u'已取消'),
              

                     )
              

                 
              

                     order_id = ShortUUIDField(_(u'order_id'), max_length=32, help_text=u'订单唯一标识', db_index=True)
              
@@ -90,6 +92,12 @@ class OrderInfo(BaseModelMixin):

                     def __unicode__(self):
              

                         return u'{0.pk}'.format(self)
              

                 
              

                +    @property
              

                +    def final_pay_status(self):
              

                +        if self.pay_status == OrderInfo.CANCELED:
              

                +            return OrderInfo.FAIL
              

                +        return self.pay_status
              

                +
              

                     def data(self, user_id=None):
              

                         try:
              

                             group_photo = GroupPhotoInfo.objects.get(photo_id=self.photo_id)
              
@@ -104,7 +112,7 @@ class OrderInfo(BaseModelMixin):

                             'to_uid': self.to_uid,
              

                             'body': self.body,
              

                             'total_fee': self.total_fee,
              

                -            'pay_status': self.pay_status,
              

                +            'pay_status': self.final_pay_status,
              

                             'paid_at': tc.remove_microsecond(self.paid_at),
              

                             'created_at': tc.remove_microsecond(self.created_at),
              

                         }
              

pay/views.py

@@ -248,6 +248,9 @@ def wx_order_cancel_api(request):

                     if user_id not in [order.from_uid]:
              

                         return response(OrderStatusCode.NO_CANCEL_PERMISSION)
              

                 
              

                +    order.pay_status = OrderInfo.CANCELED
              

                +    order.save()
              

                +
              

                     return response(200, 'Order Cancel Success', u'订单取消成功')