|
@@ -571,8 +571,7 @@ class Order_Model(models.Model):
|
|
orderID = models.CharField(blank=True, max_length=20, primary_key=True, verbose_name=u'订单id')
|
|
orderID = models.CharField(blank=True, max_length=20, primary_key=True, verbose_name=u'订单id')
|
|
paymentId = models.CharField(blank=True, max_length=64, default='', verbose_name='付款id')
|
|
paymentId = models.CharField(blank=True, max_length=64, default='', verbose_name='付款id')
|
|
trade_no = models.CharField(blank=True, max_length=32, default='', verbose_name='第三方订单号')
|
|
trade_no = models.CharField(blank=True, max_length=32, default='', verbose_name='第三方订单号')
|
|
- # 订单关联用户
|
|
|
|
- userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
|
|
|
|
|
|
+ userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE) # 订单关联用户
|
|
UID = models.CharField(max_length=20, verbose_name='设备UID')
|
|
UID = models.CharField(max_length=20, verbose_name='设备UID')
|
|
channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
|
|
channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
|
|
desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
|
|
desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
|
|
@@ -580,9 +579,9 @@ class Order_Model(models.Model):
|
|
currency = models.CharField(blank=True, default='$', max_length=32, verbose_name=u'货币')
|
|
currency = models.CharField(blank=True, default='$', max_length=32, verbose_name=u'货币')
|
|
addTime = models.IntegerField(verbose_name='添加时间', default=0)
|
|
addTime = models.IntegerField(verbose_name='添加时间', default=0)
|
|
updTime = models.IntegerField(verbose_name='更新时间', default=0)
|
|
updTime = models.IntegerField(verbose_name='更新时间', default=0)
|
|
- # endTime = models.IntegerField(verbose_name='结束时间', default=0)
|
|
|
|
isSelectDiscounts = models.SmallIntegerField(default=0, verbose_name=u'用户是否选择了第二年优惠 [0=否,1是]')
|
|
isSelectDiscounts = models.SmallIntegerField(default=0, verbose_name=u'用户是否选择了第二年优惠 [0=否,1是]')
|
|
- status = models.SmallIntegerField(default=0, verbose_name='付款状态') # 0:待支付,1:成功,2:取消,3:已退款,4: 退款失败,5: 退款成功, 9:处理中,10:付款失败
|
|
|
|
|
|
+ # 0: 待支付, 1:成功, 2: 取消, 4: 退款失败, 5: 退款成功, 9:处理中, 10:付款失败
|
|
|
|
+ status = models.SmallIntegerField(default=0, verbose_name='付款状态')
|
|
payType = models.SmallIntegerField(default=0, verbose_name='付款类型0:paypal,1:alipay')
|
|
payType = models.SmallIntegerField(default=0, verbose_name='付款类型0:paypal,1:alipay')
|
|
payTime = models.IntegerField(verbose_name='支付成功时间', default=0)
|
|
payTime = models.IntegerField(verbose_name='支付成功时间', default=0)
|
|
rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
|
|
rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
|