首頁 探索 幫助
註冊 登錄
Kodo
/
kodo
關註 2
讚好 0
派生 0

瀏覽代碼
新增积分起止时间

FFIB 11 月之前
父節點
df4d1efdbc
當前提交
f3ebf58988
共有 3 個文件被更改，包括 33 次插入 和 2 次删除
顯示文件統計
  1. 25 0
      account/migrations/0063_auto_20240529_1656.py
  2. 7 1
      account/models.py
  3. 1 1
      member/lensman_activity_admin_views.py

+ 25 - 0
account/migrations/0063_auto_20240529_1656.py
查看文件 

@@ -0,0 +1,25 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+# Generated by Django 3.2.8 on 2024-05-29 08:56
4 
+
5 
+from django.db import migrations, models
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('account', '0062_lensmaninfo_remark'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AddField(
16 
+            model_name='lensmaninfo',
17 
+            name='integral_end_date',
18 
+            field=models.DateField(blank=True, help_text='积分截止日期', null=True, verbose_name='start_date'),
19 
+        ),
20 
+        migrations.AddField(
21 
+            model_name='lensmaninfo',
22 
+            name='integral_start_date',
23 
+            field=models.DateField(blank=True, help_text='积分开始日期', null=True, verbose_name='start_date'),
24 
+        ),
25 
+    ]

+ 7 - 1
account/models.py
查看文件 

@@ -386,12 +386,14 @@ class LensmanInfo(BaseModelMixin):
386 386 
     integral = models.IntegerField(_(u'integral'), default=0, help_text=u'摄影师积分')
387 387 
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
388 388
389 
-
390 389 
     lensman_status = models.IntegerField(_(u'lensman_status'), choices=LENSMAN_STATUS, default=UNVERIFIED, help_text=u'摄影师状态', db_index=True)
391 390
392 391 
     start_date = models.DateField(_(u'start_date'), blank=True, null=True, help_text=u'合作开始日期')
393 392 
     end_date = models.DateField(_(u'end_date'), blank=True, null=True, help_text=u'合作截止日期')
394 393
394 
+    integral_start_date = models.DateField(_(u'start_date'), blank=True, null=True, help_text=u'积分开始日期')
395 
+    integral_end_date = models.DateField(_(u'start_date'), blank=True, null=True, help_text=u'积分截止日期')
396 
+
395 397 
     class Meta:
396 398 
         verbose_name = _(u'LensmanInfo')
397 399 
         verbose_name_plural = _(u'LensmanInfo')
 
@@ -417,6 +419,8 @@ class LensmanInfo(BaseModelMixin):
417 419 
             'phone': self.phone,
418 420 
             'start_date': self.start_date,
419 421 
             'end_date': self.end_date,
422 
+            'integral_start_date': self.integral_start_date,
423 
+            'integral_end_date': self.integral_end_date,
420 424 
             'integral': self.integral,
421 425 
             'is_expired': self.is_expired,
422 426 
             'lensman_status': self.lensman_status,
 
@@ -433,6 +437,8 @@ class LensmanInfo(BaseModelMixin):
433 437 
             'lensman_status': self.lensman_status,
434 438 
             'start_date': self.start_date,
435 439 
             'end_date': self.end_date,
440 
+            'integral_start_date': self.integral_start_date,
441 
+            'integral_end_date': self.integral_end_date,
436 442 
             'is_expired': self.is_expired,
437 443 
             'remark': self.remark,
438 444 
             'created_at': tc.local_string(utc_dt=self.created_at),

+ 1 - 1
member/lensman_activity_admin_views.py
查看文件 

@@ -72,7 +72,7 @@ def activity_integral_add(request, administrator):
72 72 
         integral=integral,
73 73 
         activity_id=activity_id,
74 74 
         remark=remark,
75 
-        expired_at=lensman.end_date,
75 
+        expired_at=lensman.integral_end_date,
76 76 
     )
77 77
78 78 
     return response(200, 'Add Member Activity Integral Success', u'添加积分成功')