|
@@ -183,7 +183,7 @@ class Device_User(AbstractBaseUser):
|
|
|
is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户') # False:账号登录,1:本地登录
|
|
|
subscribe_email = models.SmallIntegerField(default=0, verbose_name=u'是否订阅营销邮件') # 0:未订阅,1:订阅,2:不订阅
|
|
|
region_country = models.IntegerField(blank=True, default=0, verbose_name='关联tb_country表id')
|
|
|
- region_status = models.BooleanField(blank=True, default=True, verbose_name='地区选择状态') # 0:未选, 1:已选
|
|
|
+ region_status = models.BooleanField(blank=True, default=False, verbose_name='地区选择状态') # 0:未选, 1:已选
|
|
|
objects = UserManager()
|
|
|
|
|
|
USERNAME_FIELD = 'userID' # 必须有一个唯一标识
|
|
@@ -1012,16 +1012,19 @@ class PayCycleConfigModel(models.Model):
|
|
|
|
|
|
class PromotionRuleModel(models.Model):
|
|
|
id = models.AutoField(primary_key=True, verbose_name='主键')
|
|
|
- ruleName = models.TextField(default='', verbose_name='规则名字') # json格式, 例: {"cn":"黑色星期五","en":"Black Friday"}
|
|
|
- ruleDesc = models.TextField(default='',
|
|
|
- verbose_name='规则描述') # json格式, 例: {"cn":"买一送一","en":"buy one get one free"}
|
|
|
- ruleConfig = models.CharField(max_length=2000, default='', verbose_name='规则配置') # json格式, 例: {"buy": 1, "get": 1}
|
|
|
- startTime = models.IntegerField(verbose_name='促销活动开始时间', default=0)
|
|
|
- endTime = models.IntegerField(verbose_name='促销活动结束时间', default=0)
|
|
|
- status = models.SmallIntegerField(default=0, verbose_name='活动状态:0未进行;1进行中')
|
|
|
+ # json格式, 例: {"cn": "黑色星期五", "en": "Black Friday"}
|
|
|
+ ruleName = models.TextField(default='', verbose_name='规则名字')
|
|
|
+ # json格式, 例: {"cn": "买一送一","en": "buy one get one free"}
|
|
|
+ ruleDesc = models.TextField(default='', verbose_name='规则描述')
|
|
|
+ # json格式, 例: {"buy": 1, "get": 1}
|
|
|
+ ruleConfig = models.CharField(max_length=2000, default='', verbose_name='规则配置')
|
|
|
+ startTime = models.IntegerField(default=0, verbose_name='促销活动开始时间')
|
|
|
+ endTime = models.IntegerField(default=0, verbose_name='促销活动结束时间')
|
|
|
+ # 0: 未进行, 1: 进行中
|
|
|
+ status = models.SmallIntegerField(default=0, verbose_name='活动状态')
|
|
|
remark = models.CharField(max_length=50, default='', verbose_name='备注')
|
|
|
- popups = models.CharField(max_length=2000, default='',
|
|
|
- verbose_name='app弹窗消息') # json格式 ,例: {"cn":"买一送一","en":"buy one get one free"}
|
|
|
+ # json格式, 例: {"cn": "买一送一", "en": "buy one get one free"}
|
|
|
+ popups = models.CharField(max_length=2000, default='', verbose_name='app弹窗消息')
|
|
|
|
|
|
def __str__(self):
|
|
|
return self.id
|