pan rel=""> 64
+            name='status',
65
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
66
+        ),
67
+        migrations.AlterField(
68
+            model_name='rightinfo',
69
+            name='status',
70
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
71
+        ),
72
+        migrations.AlterField(
73
+            model_name='shottypeinfo',
74
+            name='status',
75
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
76
+        ),
77
+    ]

+ 27 - 0
member/models.py

@@ -297,6 +297,7 @@ class MemberActivityInfo(BaseModelMixin):
297 297
     lon = models.FloatField(_(u'lon'), default=1.0, help_text=u'经度')
298 298
 
299 299
     integral = models.IntegerField(_(u'integral'), default=0, help_text=u'会员积分')
300
+    group_share_integral = models.IntegerField(_(u'group_share_integral'), default=0, help_text=u'群组分享会员积分')
300 301
 
301 302
     image = models.ImageField(_(u'image'), upload_to=upload_path, blank=True, null=True, help_text=u'活动内容图片')
302 303
 
@@ -453,3 +454,29 @@ class MemberActivitySigninInfo(BaseModelMixin):
453 454
 
454 455
     def __unicode__(self):
455 456
         return unicode(self.pk)
457
+
458
+
459
+class MemberActivityGroupShareInfo(BaseModelMixin):
460
+    brand_id = models.CharField(_(u'brand_id'), max_length=32, blank=True, null=True, help_text=u'品牌唯一标识', db_index=True)
461
+    brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')
462
+
463
+    group_share_id = ShortUUIDField(_(u'group_share_id'), max_length=32, blank=True, null=True, help_text=u'活动群组分享唯一标识', db_index=True, unique=True)
464
+
465
+    share_user_id = models.CharField(_(u'share_user_id'), max_length=32, blank=True, null=True, help_text=u'分享用户唯一标识', db_index=True)
466
+    click_user_id = models.CharField(_(u'click_user_id'), max_length=32, blank=True, null=True, help_text=u'点击用户唯一标识', db_index=True)
467
+
468
+    open_gid = models.CharField(_(u'open_gid'), max_length=32, blank=True, null=True, help_text=u'群组唯一标识', db_index=True)
469
+
470
+    activity_id = models.CharField(_(u'activity_id'), max_length=32, blank=True, null=True, help_text=u'活动唯一标识', db_index=True)
471
+
472
+    title = models.CharField(_(u'title'), max_length=255, blank=True, null=True, help_text=u'活动名称')
473
+
474
+    is_integral = models.BooleanField(_(u'is_integral'), default=False, help_text=u'是否有积分')
475
+    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')
476
+
477
+    class Meta:
478
+        verbose_name = _(u'会员活动群组分享信息')
479
+        verbose_name_plural = _(u'会员活动群组分享信息')
480
+
481
+    def __unicode__(self):
482
+        return unicode(self.pk)

+ 38 - 0
message/migrations/0014_auto_20201130_0131.py

@@ -0,0 +1,38 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('message', '0013_auto_20180103_0446'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='systemmessagedeleteinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='systemmessageinfo',
20
+            name='status',
21
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='systemmessagereadinfo',
25
+            name='status',
26
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+        migrations.AlterField(
29
+            model_name='usermessageinfo',
30
+            name='msg_type',
31
+            field=models.CharField(db_index=True, default='system', help_text='消息类型', max_length=8, verbose_name='msg_type'),
32
+        ),
33
+        migrations.AlterField(
34
+            model_name='usermessageinfo',
35
+            name='status',
36
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37
+        ),
38
+    ]

+ 48 - 0
operation/migrations/0019_auto_20201130_0131.py

@@ -0,0 +1,48 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('operation', '0018_auto_20180114_2314'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='appsettingsinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='boxprogramversioninfo',
20
+            name='status',
21
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='feedbackinfo',
25
+            name='status',
26
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+        migrations.AlterField(
29
+            model_name='guestentrancecontrolinfo',
30
+            name='status',
31
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
32
+        ),
33
+        migrations.AlterField(
34
+            model_name='latestappinfo',
35
+            name='status',
36
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37
+        ),
38
+        migrations.AlterField(
39
+            model_name='patchinfo',
40
+            name='status',
41
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
42
+        ),
43
+        migrations.AlterField(
44
+            model_name='splashinfo',
45
+            name='status',
46
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
47
+        ),
48
+    ]

+ 18 - 0
pay/migrations/0012_auto_20201130_0131.py

@@ -0,0 +1,18 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('pay', '0011_auto_20180103_0446'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='orderinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+    ]

+ 28 - 0
photo/migrations/0014_auto_20201130_0131.py

@@ -0,0 +1,28 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('photo', '0013_auto_20180103_0446'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='photosinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='photouuidinfo',
20
+            name='status',
21
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='uuidinfo',
25
+            name='status',
26
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+    ]

+ 1 - 1
requirements_dj.txt

@@ -11,7 +11,7 @@ django-json-render==1.0.3
11 11
 django-json-response==1.1.5
12 12
 django-logit==1.1.3
13 13
 django-mobi2==1.0.2
14
-django-models-ext==1.1.9
14
+django-models-ext==1.1.10
15 15
 django-multidomain==1.1.4
16 16
 django-paginator2==1.1.3
17 17
 django-query==1.0.6

+ 1 - 1
requirements_pywe.txt

@@ -7,7 +7,7 @@ pywe-marketcode==1.0.3
7 7
 pywe-membercard==1.0.1
8 8
 pywe-custom-message==1.0.1
9 9
 pywe-event-message==1.0.1
10
-pywe-miniapp==1.1.5
10
+pywe-miniapp==1.1.6
11 11
 pywe-oauth==1.1.1
12 12
 pywe-pay==1.0.13
13 13
 pywe-pay-notify==1.0.5

+ 28 - 0
sales/migrations/0008_auto_20201130_0131.py

@@ -0,0 +1,28 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('sales', '0007_supersalesresponsibilityinfomodelssalestatisticinfo_sr_avatar'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='salesresponsibilityinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='salesresponsibilityinfomodelssalestatisticinfo',
20
+            name='status',
21
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='supersalesresponsibilityinfomodelssalestatisticinfo',
25
+            name='status',
26
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+    ]

+ 18 - 0
staff/migrations/0002_auto_20201130_0131.py

@@ -0,0 +1,18 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('staff', '0001_initial'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='staffdeleteclerksalesubmitloginfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+    ]

+ 68 - 0
statistic/migrations/0016_auto_20201130_0131.py

@@ -0,0 +1,68 @@
1
+# Generated by Django 2.2.15 on 2020-11-29 17:31
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('statistic', '0015_modelsalestatisticinfo_saleclerks'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AlterField(
14
+            model_name='consumedistributorsalestatisticinfo',
15
+            name='status',
16
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17
+        ),
18
+        migrations.AlterField(
19
+            model_name='consumemodelsalestatisticinfo',
20
+            name='status',
21
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='consumeprovincesalestatisticinfo',
25
+            name='status',
26
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27
+        ),
28
+        migrations.AlterField(
29
+            model_name='consumesalestatisticinfo',
30
+            name='status',
31
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
32
+        ),
33
+        migrations.AlterField(
34
+            model_name='consumeuserstatisticinfo',
35
+            name='status',
36
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37
+        ),
38
+        migrations.AlterField(
39
+            model_name='distributorsalestatisticinfo',
40
+            name='status',
41
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
42
+        ),
43
+        migrations.AlterField(
44
+            model_name='modelsalestatisticinfo',
45
+            name='status',
46
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
47
+        ),
48
+        migrations.AlterField(
49
+            model_name='provincesalestatisticinfo',
50
+            name='status',
51
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
52
+        ),
53
+        migrations.AlterField(
54
+            model_name='registerstatisticinfo',
55
+            name='status',
56
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
57
+        ),
58
+        migrations.AlterField(
59
+            model_name='saleclerksalestatisticinfo',
60
+            name='status',
61
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
62
+        ),
63
+        migrations.AlterField(
64
+            model_name='salestatisticinfo',
65
+            name='status',
66
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
67
+        ),
68
+    ]

Kodo/kodo - Gogs: Go Git Service

10 Commissions (4a03f4d735ebff345a2951ff44b7ac3405d9569c)

Auteur SHA1 Message Date
  Brightcells 018d52f61d Update package django_xxx 7 ans auparavant
  Brightcells 627187a7d7 Update Kodo 7 ans auparavant
  Brightcells c73d195d23 Make some message ReadOnly 7 ans auparavant
  Brightcells ee7388cd15 add src for SystemMessageInfo 9 ans auparavant
  Brightcells 9618c6d3bd add var for jswe.js 9 ans auparavant
  Brightcells fabef63211 set line_length=200 for isort 9 ans auparavant
  Brightcells f72ccb1875 isort import 9 ans auparavant
  Brightcells 165424743a modify message relative apis 9 ans auparavant
  Brightcells 8f14561134 UserMessageInfo in admin.py 9 ans auparavant
  Brightcells 30daca135b add api message_list_api/message_type_list_api/message_read_api 9 ans auparavant