511
test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
|
|
501
|
512
|
|
|
|
|
@@ -523,7 +534,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin):
|
|
523
|
534
|
|
|
524
|
535
|
@property
|
|
525
|
536
|
def data(self):
|
|
526
|
|
- if self.submit_during_activity:
|
|
|
537
|
+ if self.submit_during_activity and not self.has_used:
|
|
527
|
538
|
try:
|
|
528
|
539
|
act = ActivityInfo.objects.get(pk=self.activity_id)
|
|
529
|
540
|
except ActivityInfo.DoesNotExist:
|
|
|
|
@@ -28,10 +28,15 @@ class ProductModelStatusCode(BaseStatusCode):
|
|
28
|
28
|
|
|
29
|
29
|
|
|
30
|
30
|
class ProductDistributorStatusCode(BaseStatusCode):
|
|
31
|
|
- """ 经销商相关错误码 5011xx """
|
|
|
31
|
+ """ 经销商相关错误码 5012xx """
|
|
32
|
32
|
DISTRIBUTOR_NOT_FOUND = StatusCodeField(501201, 'Distributor Not Found', description=u'经销商不存在')
|
|
33
|
33
|
|
|
34
|
34
|
|
|
|
35
|
+class ProductMachineStatusCode(BaseStatusCode):
|
|
|
36
|
+ """ 机器相关错误码 5013xx """
|
|
|
37
|
+ SN_NOT_FOUND = StatusCodeField(501301, 'SN Not Found', description=u'序列号不存在')
|
|
|
38
|
+
|
|
|
39
|
+
|
|
35
|
40
|
class ProductStatusCode(BaseStatusCode):
|
|
36
|
41
|
""" 产品相关错误码 5020xx """
|
|
37
|
42
|
PRODUCT_NOT_FOUND = StatusCodeField(502001, 'Product Not Found', description=u'产品不存在')
|