feat: 抽奖「我的抽奖」接口与数据模型

新增 4 个接口(api/sale):
  mp/lottery/campaign/list 我的抽奖列表(按活动聚合)
  mp/lottery/campaign/detail 活动详情(名额明细 + 报名/收货信息)
  mp/lottery/campaign/info/update 修改报名信息(开奖后锁定)
  mp/lottery/campaign/address/update 保存收货信息(活动级)

数据模型(迁移 0015):
  LotteryCampaignInfo 增加 prize_text
  LotteryEntryInfo 增加 result(pending / won / lost)
  新增 LotteryAddressInfo 收货信息表

同时修复 join 接口两处问题:活动不存在时因 get() 抛异常返回 500;
小程序姓名字段为 title,原代码只读 name 导致姓名未入库。参与改为按
campaign_id + serial_no 幂等,一台镜头不重复占名额。

后台:名额结果可直接编辑,新增收货信息管理。

FFIB 11 ore fa
parent
commit
51254cd16b
6 ha cambiato i file con 411 aggiunte e 62 eliminazioni
  1. 174 53
      api/sale/lottery_views.py
  2. 7 1
      api/sale/urls.py
  3. 17 3
      sales/admin.py
  4. 46 0
      sales/migrations/0015_auto_20261115_1730.py
  5. 163 4
      sales/models.py
  6. 4 1
      utils/error/errno_utils.py

+ 174 - 53
api/sale/lottery_views.py

@@ -1,85 +1,206 @@
1 1
 # -*- coding: utf-8 -*-
2 2
 
3
-from django.db import IntegrityError, transaction
4
-from django.utils import timezone
3
+import re
4
+
5
+from django.db import transaction
5 6
 from django_logit import logit
6 7
 from django_response import response
7
-from django.db.models import Q
8 8
 
9 9
 from account.models import UserInfo
10
-from sales.models import LotteryCampaignInfo, LotteryEntryInfo
11
-from utils.error.errno_utils import LotteryStatusCode, UserStatusCode
10
+from sales.models import LotteryAddressInfo, LotteryCampaignInfo, LotteryEntryInfo
11
+from utils.error.errno_utils import LotteryStatusCode, ParamStatusCode, UserStatusCode
12
+
13
+PHONE_RE = re.compile(r'^1\d{10}$')
14
+
15
+
16
+# ─────────────────────────── 请求级解析 ───────────────────────────
17
+
18
+
19
+def _get_user(user_id):
20
+    if not user_id:
21
+        return None
22
+    return UserInfo.objects.filter(user_id=user_id).first()
23
+
24
+
25
+def _get_campaign(campaign_id):
26
+    if not campaign_id:
27
+        return None
28
+    return LotteryCampaignInfo.objects.active().filter(campaign_id=campaign_id).first()
29
+
12 30
 
13
-def join_lottery(user, serial_no, model_id='', campaign_id='', submit_pk='', phone='', model_name=''):
14
-    """
15
-    写入抽奖名额(幂等)
31
+def _valid_contact(name, phone):
32
+    return bool(name) and bool(PHONE_RE.match(phone))
33
+
34
+
35
+# ─────────────────────────── 接口 ───────────────────────────
36
+
37
+
38
+@logit(res=True)
39
+@transaction.atomic
40
+def lottery_join_api(request):
41
+    """抽奖参与接口:写名额(按 campaign_id + serial_no 幂等,一台镜头一个名额)"""
42
+    user = _get_user(request.POST.get('user_id', ''))
43
+
44
+    if not user:
45
+        return response(UserStatusCode.USER_NOT_FOUND)
16 46
 
17
-    返回 (entry, campaign, is_new):
18
-      · 没有进行中的活动 → (None, None, False)
19
-      · 已有名额         → (entry, campaign, False)
20
-      · 首次参与         → (entry, campaign, True)
21
-    """
22
-    serial_no = (serial_no or '').strip()
47
+    serial_no = (request.POST.get('serial_no') or '').strip()
23 48
 
24
-    campaign = LotteryCampaignInfo.objects.get(status=True, campaign_id=campaign_id)
49
+    if not serial_no:
50
+        return response(ParamStatusCode.PARAM_INVALID)
51
+
52
+    campaign = _get_campaign(request.POST.get('campaign_id', ''))
25 53
 
26 54
     if not campaign:
27
-        return None, None
55
+        return response(LotteryStatusCode.CAMPAIGN_NOT_FOUND)
56
+
57
+    # 小程序把姓名放在 title 里(历史字段命名),name 兼容后台手工调用
58
+    name = (request.POST.get('name') or request.POST.get('title') or '').strip()
59
+    phone = (request.POST.get('phone') or '').strip()
28 60
 
29
-    # 嵌套 atomic 生成 savepoint:并发插入冲突后还能继续查询
30
-    with transaction.atomic():
31
-        entry, created = LotteryEntryInfo.objects.update_or_create(
61
+    # 这里按 serial_no 找而不加 status 过滤:软删除的名额也要复用,否则会撞唯一约束
62
+    entry = LotteryEntryInfo.objects.filter(campaign_id=campaign.campaign_id, serial_no=serial_no).first()
63
+
64
+    if entry:
65
+        # 重复提交:只补写信息,不新增名额
66
+        entry.campaign_title = campaign.title
67
+        entry.name = entry.name or name
68
+        entry.phone = entry.phone or phone
69
+        entry.model_id = entry.model_id or request.POST.get('model_id', '')
70
+        entry.model_name = entry.model_name or request.POST.get('model_name', '')
71
+        entry.submit_pk = entry.submit_pk or request.POST.get('submit_pk', '')
72
+        entry.save()
73
+    else:
74
+        LotteryEntryInfo.objects.create(
32 75
             campaign_id=campaign.campaign_id,
33
-            serial_no=serial_no,
34
-            submit_pk=submit_pk,
35
-            title=campaign.title,
76
+            campaign_title=campaign.title,
36 77
             user_id=user.user_id,
37
-            model_id=model_id,
38
-            model_name=model_name,
39
-            defaults={
40
-                'name': name,
41
-                'phone': phone,
42
-            }
78
+            name=name,
79
+            phone=phone,
80
+            serial_no=serial_no,
81
+            model_id=request.POST.get('model_id', ''),
82
+            model_name=request.POST.get('model_name', ''),
83
+            submit_pk=request.POST.get('submit_pk', ''),
43 84
         )
44 85
 
45
-    return entry, campaign
86
+    return response(200, 'join lottery campaign success', u'参与抽奖成功')
87
+
88
+
89
+@logit(res=True)
90
+def lottery_campaign_list_api(request):
91
+    """我的抽奖列表:按活动聚合"""
92
+    user = _get_user(request.POST.get('user_id', ''))
93
+
94
+    if not user:
95
+        return response(UserStatusCode.USER_NOT_FOUND)
96
+
97
+    entries = list(LotteryEntryInfo.objects.of_user(user.user_id))
98
+
99
+    if not entries:
100
+        return response(200, 'get lottery campaigns success', u'获取我的抽奖成功', data=[])
101
+
102
+    grouped = LotteryEntryInfo.group_by_campaign(entries)
103
+    campaigns = LotteryCampaignInfo.objects.active().filter(campaign_id__in=list(grouped))
104
+    data = [campaign.list_data(grouped[campaign.campaign_id]) for campaign in campaigns]
105
+
106
+    return response(200, 'get lottery campaigns success', u'获取我的抽奖成功', data=data)
107
+
108
+
109
+@logit(res=True)
110
+def lottery_campaign_detail_api(request):
111
+    """单个活动的参与详情"""
112
+    user = _get_user(request.POST.get('user_id', ''))
113
+
114
+    if not user:
115
+        return response(UserStatusCode.USER_NOT_FOUND)
116
+
117
+    campaign = _get_campaign(request.POST.get('campaign_id', ''))
118
+
119
+    if not campaign:
120
+        return response(LotteryStatusCode.CAMPAIGN_NOT_FOUND)
121
+
122
+    entries = list(
123
+        LotteryEntryInfo.objects.of_user(user.user_id).of_campaign(campaign.campaign_id).order_by('-created_at')
124
+    )
125
+
126
+    if not entries:
127
+        return response(LotteryStatusCode.ENTRY_NOT_FOUND)
128
+
129
+    address = LotteryAddressInfo.objects.of_user_campaign(user.user_id, campaign.campaign_id).first()
130
+
131
+    return response(200, 'get lottery campaign success', u'获取抽奖详情成功',
132
+                    data=campaign.detail_data(entries, address))
46 133
 
47 134
 
48 135
 @logit(res=True)
49 136
 @transaction.atomic
50
-def lottery_join_api(request):
51
-    """抽奖参与接口:写入名额"""
52
-    user_id = request.POST.get('user_id', '')
53
-    serial_no = request.POST.get('serial_no', '')
54
-    model_id = request.POST.get('model_id')
55
-    campaign_id = request.POST.get('campaign_id', '')
56
-    submit_pk = request.POST.get('submit_pk', '')
57
-    name = request.POST.get('name', '')
58
-    phone = request.POST.get('phone', '')
59
-    model_name = request.POST.get('model_name', '')
60
-
61
-    try:
62
-        user = UserInfo.objects.select_for_update().get(user_id=user_id)
63
-    except UserInfo.DoesNotExist:
137
+def lottery_campaign_info_update_api(request):
138
+    """修改报名信息:应用到该活动下的全部名额(开奖后锁定)"""
139
+    user = _get_user(request.POST.get('user_id', ''))
140
+
141
+    if not user:
142
+        return response(UserStatusCode.USER_NOT_FOUND)
143
+
144
+    campaign = _get_campaign(request.POST.get('campaign_id', ''))
145
+
146
+    if not campaign:
147
+        return response(LotteryStatusCode.CAMPAIGN_NOT_FOUND)
148
+
149
+    name = (request.POST.get('name') or '').strip()
150
+    phone = (request.POST.get('phone') or '').strip()
151
+
152
+    if not _valid_contact(name, phone):
153
+        return response(ParamStatusCode.PARAM_INVALID)
154
+
155
+    entries = LotteryEntryInfo.objects.of_user(user.user_id).of_campaign(campaign.campaign_id)
156
+
157
+    if not entries.exists():
158
+        return response(LotteryStatusCode.ENTRY_NOT_FOUND)
159
+
160
+    if campaign.is_locked():
161
+        return response(LotteryStatusCode.CAMPAIGN_LOCKED)
162
+
163
+    entries.update(name=name, phone=phone)
164
+
165
+    return response(200, 'update lottery info success', u'修改报名信息成功')
166
+
167
+
168
+@logit(res=True)
169
+@transaction.atomic
170
+def lottery_campaign_address_update_api(request):
171
+    """保存收货信息:活动级,一个用户一条"""
172
+    user = _get_user(request.POST.get('user_id', ''))
173
+
174
+    if not user:
64 175
         return response(UserStatusCode.USER_NOT_FOUND)
65 176
 
66
-    campaign = LotteryCampaignInfo.objects.get(status=True, campaign_id=campaign_id)
177
+    campaign = _get_campaign(request.POST.get('campaign_id', ''))
67 178
 
68 179
     if not campaign:
69 180
         return response(LotteryStatusCode.CAMPAIGN_NOT_FOUND)
70 181
 
71
-    LotteryEntryInfo.objects.update_or_create(
182
+    receiver = (request.POST.get('receiver') or '').strip()
183
+    phone = (request.POST.get('phone') or '').strip()
184
+    region = (request.POST.get('region') or '').strip()
185
+    detail = (request.POST.get('detail') or '').strip()
186
+
187
+    if not _valid_contact(receiver, phone) or not region or not detail:
188
+        return response(ParamStatusCode.PARAM_INVALID)
189
+
190
+    has_entry = LotteryEntryInfo.objects.of_user(user.user_id).of_campaign(campaign.campaign_id).exists()
191
+
192
+    if not has_entry:
193
+        return response(LotteryStatusCode.ENTRY_NOT_FOUND)
194
+
195
+    LotteryAddressInfo.objects.update_or_create(
72 196
         campaign_id=campaign.campaign_id,
73
-        serial_no=serial_no,
74
-        submit_pk=submit_pk,
75 197
         user_id=user.user_id,
76
-        model_id=model_id,
77 198
         defaults={
78
-            'campaign_title': campaign.title,
79
-            'name': name,
199
+            'receiver': receiver,
80 200
             'phone': phone,
81
-            'model_name': model_name,
201
+            'region': region,
202
+            'detail': detail,
82 203
         }
83
-    )        
204
+    )
84 205
 
85
-    return response(200, 'join lottery campaign success', '参与抽奖成功') 
206
+    return response(200, 'save lottery address success', u'保存收货信息成功')

+ 7 - 1
api/sale/urls.py

@@ -6,4 +6,10 @@ from api.sale import lottery_views
6 6
 
7 7
 urlpatterns = [
8 8
     url(r'^lottery/join$', lottery_views.lottery_join_api, name='lottery_join_api'),
9
-]
9
+
10
+    # 我的抽奖
11
+    url(r'^mp/lottery/campaign/list$', lottery_views.lottery_campaign_list_api, name='lottery_campaign_list_api'),
12
+    url(r'^mp/lottery/campaign/detail$', lottery_views.lottery_campaign_detail_api, name='lottery_campaign_detail_api'),
13
+    url(r'^mp/lottery/campaign/info/update$', lottery_views.lottery_campaign_info_update_api, name='lottery_campaign_info_update_api'),
14
+    url(r'^mp/lottery/campaign/address/update$', lottery_views.lottery_campaign_address_update_api, name='lottery_campaign_address_update_api'),
15
+]

+ 17 - 3
sales/admin.py

@@ -3,7 +3,8 @@
3 3
 from django.contrib import admin
4 4
 
5 5
 from sales.models import (SalesResponsibilityInfo, SalesResponsibilityInfoModelsSaleStatisticInfo,
6
-                          SuperSalesResponsibilityInfoModelsSaleStatisticInfo, LotteryEntryInfo, LotteryCampaignInfo)
6
+                          SuperSalesResponsibilityInfoModelsSaleStatisticInfo, LotteryAddressInfo,
7
+                          LotteryEntryInfo, LotteryCampaignInfo)
7 8
 
8 9
 
9 10
 class SalesResponsibilityInfoAdmin(admin.ModelAdmin):
@@ -19,10 +20,22 @@ class SuperSalesResponsibilityInfoModelsSaleStatisticInfoAdmin(admin.ModelAdmin)
19 20
     list_display = ('brand_id', 'sr_id', 'sr_name', 'ymd', 'today_num', 'yesterday_num', 'current_month', 'last_month', 'position', 'status', 'created_at', 'updated_at')
20 21
 
21 22
 class LotteryEntryInfoAdmin(admin.ModelAdmin):
22
-    list_display = ('entry_id', 'campaign_id', 'user_id', 'campaign_title', 'phone', 'created_at', 'updated_at')
23
+    list_display = ('entry_id', 'campaign_id', 'campaign_title', 'user_id', 'name', 'phone', 'serial_no',
24
+                    'model_name', 'result', 'status', 'created_at', 'updated_at')
25
+    list_filter = ('campaign_id', 'result', 'status')
26
+    search_fields = ('serial_no', 'phone', 'name', 'user_id')
27
+    # 开奖时人工把中奖名额的 result 改成 won,未中奖改成 lost
28
+    list_editable = ('result',)
23 29
 
24 30
 class LotteryCampaignInfoAdmin(admin.ModelAdmin):
25
-    list_display = ('campaign_id', 'title', 'start_at', 'end_at', 'draw_at', 'created_at', 'updated_at')
31
+    list_display = ('campaign_id', 'title', 'prize_text', 'start_at', 'end_at', 'draw_at', 'status', 'created_at', 'updated_at')
32
+    list_filter = ('status',)
33
+    search_fields = ('campaign_id', 'title')
34
+
35
+class LotteryAddressInfoAdmin(admin.ModelAdmin):
36
+    list_display = ('campaign_id', 'user_id', 'receiver', 'phone', 'region', 'detail', 'status', 'created_at', 'updated_at')
37
+    list_filter = ('campaign_id', 'status')
38
+    search_fields = ('receiver', 'phone', 'user_id')
26 39
 
27 40
 
28 41
 admin.site.register(SalesResponsibilityInfo, SalesResponsibilityInfoAdmin)
@@ -30,3 +43,4 @@ admin.site.register(SalesResponsibilityInfoModelsSaleStatisticInfo, SalesRespons
30 43
 admin.site.register(SuperSalesResponsibilityInfoModelsSaleStatisticInfo, SuperSalesResponsibilityInfoModelsSaleStatisticInfoAdmin)
31 44
 admin.site.register(LotteryEntryInfo, LotteryEntryInfoAdmin)
32 45
 admin.site.register(LotteryCampaignInfo, LotteryCampaignInfoAdmin)
46
+admin.site.register(LotteryAddressInfo, LotteryAddressInfoAdmin)

+ 46 - 0
sales/migrations/0015_auto_20261115_1730.py

@@ -0,0 +1,46 @@
1
+# -*- coding: utf-8 -*-
2
+
3
+# Generated by Django 3.2.16 on 2026-11-15 09:30
4
+
5
+from django.db import migrations, models
6
+
7
+
8
+class Migration(migrations.Migration):
9
+
10
+    dependencies = [
11
+        ('sales', '0014_alter_lotteryentryinfo_unique_together'),
12
+    ]
13
+
14
+    operations = [
15
+        migrations.AddField(
16
+            model_name='lotterycampaigninfo',
17
+            name='prize_text',
18
+            field=models.CharField(blank=True, help_text='奖品文案,如「2,000 元京东卡 × 3 名」', max_length=255, null=True, verbose_name='prize_text'),
19
+        ),
20
+        migrations.AddField(
21
+            model_name='lotteryentryinfo',
22
+            name='result',
23
+            field=models.CharField(choices=[('pending', '待开奖'), ('won', '已中奖'), ('lost', '未中奖')], db_index=True, default='pending', help_text='名额结果:待开奖 / 已中奖 / 未中奖', max_length=16, verbose_name='result'),
24
+        ),
25
+        migrations.CreateModel(
26
+            name='LotteryAddressInfo',
27
+            fields=[
28
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
29
+                ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),
30
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
31
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
32
+                ('campaign_id', models.CharField(db_index=True, help_text='所属活动唯一标识', max_length=32, verbose_name='campaign_id')),
33
+                ('user_id', models.CharField(blank=True, db_index=True, help_text='用户唯一标识', max_length=32, null=True, verbose_name='user_id')),
34
+                ('receiver', models.CharField(blank=True, help_text='收货人', max_length=64, null=True, verbose_name='receiver')),
35
+                ('phone', models.CharField(blank=True, help_text='收货手机', max_length=11, null=True, verbose_name='phone')),
36
+                ('region', models.CharField(blank=True, help_text='省 市 区,如「上海市 上海市 徐汇区」', max_length=128, null=True, verbose_name='region')),
37
+                ('detail', models.CharField(blank=True, help_text='详细地址', max_length=255, null=True, verbose_name='detail')),
38
+            ],
39
+            options={
40
+                'verbose_name': '抽奖收货信息',
41
+                'verbose_name_plural': '抽奖收货信息',
42
+                'ordering': ('-created_at',),
43
+                'unique_together': {('campaign_id', 'user_id')},
44
+            },
45
+        ),
46
+    ]

+ 163 - 4
sales/models.py

@@ -13,6 +13,13 @@ from datetime import datetime
13 13
 from django.utils import timezone
14 14
 
15 15
 
16
+def to_local_iso(dt):
17
+    """aware datetime → '2026-10-29T00:00:00+08:00'(北京时间 ISO,小程序直接 new Date 解析)"""
18
+    if not dt:
19
+        return None
20
+    return '%s+08:00' % tc.local_string(utc_dt=dt, format='%Y-%m-%dT%H:%M:%S')
21
+
22
+
16 23
 class SalesResponsibilityInfo(BaseModelMixin):
17 24
     REFUSED = -1
18 25
     UNVERIFIED = 0
@@ -170,12 +177,24 @@ class SuperSalesResponsibilityInfoModelsSaleStatisticInfo(BaseModelMixin):
170 177
         }
171 178
 
172 179
 
180
+class LotteryCampaignQuerySet(models.QuerySet):
181
+    """抽奖活动查询集"""
182
+
183
+    def active(self):
184
+        """有效活动:后台停用(status=False)的不算"""
185
+        return self.filter(status=True)
186
+
187
+
173 188
 class LotteryCampaignInfo(BaseModelMixin):
174 189
     """抽奖活动"""
175 190
 
191
+    objects = LotteryCampaignQuerySet.as_manager()
192
+
176 193
     campaign_id = ShortUUIDField(_(u'campaign_id'), max_length=32, blank=True, null=True,
177 194
                                  help_text=u'活动唯一标识', db_index=True, unique=True)
178 195
     title = models.CharField(_(u'title'), max_length=255, help_text=u'活动标题')
196
+    prize_text = models.CharField(_(u'prize_text'), max_length=255, blank=True, null=True,
197
+                                  help_text=u'奖品文案,如「2,000 元京东卡 × 3 名」')
179 198
 
180 199
     start_at = models.DateTimeField(_(u'start_at'), blank=True, null=True, help_text=u'参与开始时间')
181 200
     end_at = models.DateTimeField(_(u'end_at'), blank=True, null=True, help_text=u'参与结束时间')
@@ -193,21 +212,77 @@ class LotteryCampaignInfo(BaseModelMixin):
193 212
     def is_active(self):
194 213
         now = timezone.now()          # ← aware,和 DB 值可比
195 214
         return bool(self.start_at and self.end_at and self.start_at <= now <= self.end_at)
215
+
216
+    def is_locked(self):
217
+        """已到开奖时间:报名信息锁定,只能改收货信息"""
218
+        return bool(self.draw_at and timezone.now() >= self.draw_at)
219
+
196 220
     @property
197 221
     def data(self):
198 222
         return {
199 223
             'campaign_id': self.campaign_id,
200 224
             'title': self.title,
201
-            'start_at': self.start_at and tc.local_string(utc_dt=self.start_at, format='%Y-%m-%d'),
202
-            'end_at': self.end_at and tc.local_string(utc_dt=self.end_at, format='%Y-%m-%d'),
203
-            'draw_at': self.draw_at and tc.local_string(utc_dt=self.draw_at, format='%Y-%m-%d'),
225
+            'prize_text': self.prize_text or '',
226
+            'start_at': to_local_iso(self.start_at),
227
+            'end_at': to_local_iso(self.end_at),
228
+            'draw_at': to_local_iso(self.draw_at),
204 229
             'model_ids': self.model_ids,
205 230
         }
206 231
 
232
+    def list_data(self, entries):
233
+        """「我的抽奖」列表项:活动维度,不含名额明细"""
234
+        return {
235
+            'campaign_id': self.campaign_id,
236
+            'title': self.title,
237
+            'draw_at': to_local_iso(self.draw_at),
238
+            'prize_text': self.prize_text or '',
239
+            'entry_count': len(entries),
240
+            'status': LotteryEntryInfo.summary_status(entries),
241
+        }
242
+
243
+    def detail_data(self, entries, address=None):
244
+        """活动详情:列表项 + 活动期 + 名额明细 + 报名 / 收货信息"""
245
+        name, phone = LotteryEntryInfo.latest_profile(entries)
246
+
247
+        data = self.list_data(entries)
248
+        data.update({
249
+            'start_at': to_local_iso(self.start_at),
250
+            'end_at': to_local_iso(self.end_at),
251
+            'entries': [entry.data for entry in entries],
252
+            'name': name,
253
+            'phone': phone,
254
+            'address': address.data if address else None,
255
+            'locked': self.is_locked(),
256
+        })
257
+
258
+        return data
259
+
260
+
261
+class LotteryEntryQuerySet(models.QuerySet):
262
+    """抽奖名额查询集"""
263
+
264
+    def of_user(self, user_id):
265
+        return self.filter(user_id=user_id, status=True)
266
+
267
+    def of_campaign(self, campaign_id):
268
+        return self.filter(campaign_id=campaign_id, status=True)
269
+
207 270
 
208 271
 class LotteryEntryInfo(BaseModelMixin):
209 272
     """抽奖名单"""
210 273
 
274
+    PENDING = 'pending'
275
+    WON = 'won'
276
+    LOST = 'lost'
277
+
278
+    RESULT_TUPLE = (
279
+        (PENDING, u'待开奖'),
280
+        (WON, u'已中奖'),
281
+        (LOST, u'未中奖'),
282
+    )
283
+
284
+    objects = LotteryEntryQuerySet.as_manager()
285
+
211 286
     entry_id = ShortUUIDField(_(u'entry_id'), max_length=32, blank=True, null=True,
212 287
                               help_text=u'名额唯一标识', db_index=True, unique=True)
213 288
     campaign_id = models.CharField(_(u'campaign_id'), max_length=32,
@@ -229,6 +304,8 @@ class LotteryEntryInfo(BaseModelMixin):
229 304
                                 help_text=u'型号名称', db_index=True)
230 305
     submit_pk = models.CharField(_(u'submit_pk'), max_length=32, blank=True, null=True,
231 306
                                help_text=u'提交记录唯一标识', db_index=True)
307
+    result = models.CharField(_(u'result'), max_length=16, choices=RESULT_TUPLE, default=PENDING,
308
+                              help_text=u'名额结果:待开奖 / 已中奖 / 未中奖', db_index=True)
232 309
 
233 310
     class Meta:
234 311
         verbose_name = _(u'抽奖名单')
@@ -239,4 +316,86 @@ class LotteryEntryInfo(BaseModelMixin):
239 316
         )
240 317
 
241 318
     def __unicode__(self):
242
-        return u'{}-{}'.format(self.campaign_id, self.serial_no)
319
+        return u'{}-{}'.format(self.campaign_id, self.serial_no)
320
+
321
+    @classmethod
322
+    def summary_status(cls, entries):
323
+        """多个名额汇总成一个活动状态:任一中奖即中奖;否则有未中奖结果即未中奖;否则待开奖"""
324
+        if any(entry.result == cls.WON for entry in entries):
325
+            return cls.WON
326
+
327
+        if any(entry.result == cls.LOST for entry in entries):
328
+            return cls.LOST
329
+
330
+        return cls.PENDING
331
+
332
+    @classmethod
333
+    def latest_profile(cls, entries):
334
+        """报名信息:从名额里取最近一条有值的姓名 / 手机(entries 需按 created_at 倒序)"""
335
+        name = next((entry.name for entry in entries if entry.name), '')
336
+        phone = next((entry.phone for entry in entries if entry.phone), '')
337
+
338
+        return name, phone
339
+
340
+    @classmethod
341
+    def group_by_campaign(cls, entries):
342
+        """名额按活动分组:{campaign_id: [entry, ...]}"""
343
+        grouped = {}
344
+
345
+        for entry in entries:
346
+            grouped.setdefault(entry.campaign_id, []).append(entry)
347
+
348
+        return grouped
349
+
350
+    @property
351
+    def data(self):
352
+        return {
353
+            'serial_no': self.serial_no,
354
+            'model_name': self.model_name or '',
355
+            'joined_at': to_local_iso(self.created_at),
356
+            'status': self.result or self.PENDING,
357
+        }
358
+
359
+
360
+class LotteryAddressQuerySet(models.QuerySet):
361
+    """抽奖收货信息查询集"""
362
+
363
+    def of_user_campaign(self, user_id, campaign_id):
364
+        return self.filter(user_id=user_id, campaign_id=campaign_id, status=True)
365
+
366
+
367
+class LotteryAddressInfo(BaseModelMixin):
368
+    """抽奖收货信息(活动级,一个用户在一个活动下一条)"""
369
+
370
+    objects = LotteryAddressQuerySet.as_manager()
371
+
372
+    campaign_id = models.CharField(_(u'campaign_id'), max_length=32,
373
+                                   help_text=u'所属活动唯一标识', db_index=True)
374
+    user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True,
375
+                               help_text=u'用户唯一标识', db_index=True)
376
+
377
+    receiver = models.CharField(_(u'receiver'), max_length=64, blank=True, null=True, help_text=u'收货人')
378
+    phone = models.CharField(_(u'phone'), max_length=11, blank=True, null=True, help_text=u'收货手机')
379
+    region = models.CharField(_(u'region'), max_length=128, blank=True, null=True,
380
+                              help_text=u'省 市 区,如「上海市 上海市 徐汇区」')
381
+    detail = models.CharField(_(u'detail'), max_length=255, blank=True, null=True, help_text=u'详细地址')
382
+
383
+    class Meta:
384
+        verbose_name = _(u'抽奖收货信息')
385
+        verbose_name_plural = _(u'抽奖收货信息')
386
+        ordering = ('-created_at',)
387
+        unique_together = (
388
+            ('campaign_id', 'user_id'),
389
+        )
390
+
391
+    def __unicode__(self):
392
+        return u'{}-{}'.format(self.campaign_id, self.receiver or '')
393
+
394
+    @property
395
+    def data(self):
396
+        return {
397
+            'receiver': self.receiver or '',
398
+            'phone': self.phone or '',
399
+            'region': self.region or '',
400
+            'detail': self.detail or '',
401
+        }

+ 4 - 1
utils/error/errno_utils.py

@@ -6,6 +6,7 @@ from StatusCode import BaseStatusCode, StatusCodeField
6 6
 class ParamStatusCode(BaseStatusCode):
7 7
     """ 4000xx 参数相关错误码 """
8 8
     PARAM_NOT_FOUND = StatusCodeField(400000, 'Param Not Found', description=u'参数不存在')
9
+    PARAM_INVALID = StatusCodeField(400001, 'Param Invalid', description=u'参数格式不正确')
9 10
 
10 11
 
11 12
 class PermissionStatusCode(BaseStatusCode):
@@ -238,4 +239,6 @@ class TencentCloudStatusCode(BaseStatusCode):
238 239
 
239 240
 class LotteryStatusCode(BaseStatusCode):
240 241
     """ 抽奖相关错误码 5099xx """
241
-    CAMPAIGN_NOT_FOUND = StatusCodeField(509902, 'Campaign Not Found', description=u'抽奖活动不存在')
242
+    CAMPAIGN_NOT_FOUND = StatusCodeField(509902, 'Campaign Not Found', description=u'抽奖活动不存在')
243
+    ENTRY_NOT_FOUND = StatusCodeField(509903, 'Entry Not Found', description=u'抽奖名额不存在')
244
+    CAMPAIGN_LOCKED = StatusCodeField(509904, 'Campaign Locked', description=u'已开奖,报名信息不可修改')