an rel="diff-5d15b431794c766a35a0eb13c084eb08bb6448e3R52">52 
+            field=models.BooleanField(default=False, help_text='外观性能状态', verbose_name='appearance_performance_status'),
53 
+        ),
54 
+        migrations.AlterField(
55 
+            model_name='tenancyshotinfo',
56 
+            name='front_cap_status',
57 
+            field=models.BooleanField(default=False, help_text='前盖状态', verbose_name='front_cap_status'),
58 
+        ),
59 
+        migrations.AlterField(
60 
+            model_name='tenancyshotinfo',
61 
+            name='lens_hood_status',
62 
+            field=models.BooleanField(default=False, help_text='遮光罩状态', verbose_name='lens_hood_status'),
63 
+        ),
64 
+        migrations.AlterField(
65 
+            model_name='tenancyshotinfo',
66 
+            name='rear_cap_status',
67 
+            field=models.BooleanField(default=False, help_text='后盖状态', verbose_name='rear_cap_status'),
68 
+        ),
69 
+        migrations.AlterField(
70 
+            model_name='tenancyshotinfo',
71 
+            name='tripod_ring_status',
72 
+            field=models.BooleanField(default=False, help_text='脚架环状态', verbose_name='tripod_ring_status'),
73 
+        ),
74 
+    ]

+ 41 - 7
tenancy/models.py
查看文件 

@@ -7,7 +7,7 @@ from jsonfield import JSONField
7 7 
 from shortuuidfield import ShortUUIDField
8 8 
 from TimeConvert import TimeConvert as tc
9 9
10 
-from mch.models import ModelInfo
10 
+from mch.models import ModelInfo, AdministratorInfo
11 11
12 12
13 13 
 class TenancyShotInfo(BaseModelMixin):
 
@@ -20,11 +20,11 @@ class TenancyShotInfo(BaseModelMixin):
20 20 
     model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)
21 21 
     model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称')
22 22 
     sn = models.CharField(_(u'sn'), max_length=32, blank=True, null=True, help_text=u'序列号', db_index=True)
23 
-    front_cap_status = models.BooleanField(_(u'front_cap_status'), default=True, help_text=u'前盖状态')
24 
-    rear_cap_status = models.BooleanField(_(u'rear_cap_status'), default=True, help_text=u'后盖状态')
25 
-    lens_hood_status = models.BooleanField(_(u'lens_hood_status'), default=True, help_text=u'遮光罩状态')
26 
-    tripod_ring_status = models.BooleanField(_(u'tripod_ring_status'), default=True, help_text=u'脚架环状态')
27 
-    appearance_performance_status = models.BooleanField(_(u'appearance_performance_status'), default=True, help_text=u'外观性能状态')
23 
+    front_cap_status = models.BooleanField(_(u'front_cap_status'), default=False, help_text=u'前盖状态')
24 
+    rear_cap_status = models.BooleanField(_(u'rear_cap_status'), default=False, help_text=u'后盖状态')
25 
+    lens_hood_status = models.BooleanField(_(u'lens_hood_status'), default=False, help_text=u'遮光罩状态')
26 
+    tripod_ring_status = models.BooleanField(_(u'tripod_ring_status'), default=False, help_text=u'脚架环状态')
27 
+    appearance_performance_status = models.BooleanField(_(u'appearance_performance_status'), default=False, help_text=u'外观性能状态')
28 28 
     tenancy_status = models.IntegerField(_(u'tenancy_status'), choices=TENANCY_STATUS, default=0, help_text=u'租借状态')
29 29
30 30 
     class Meta:
 
@@ -70,10 +70,20 @@ class TenancyShotRequestInfo(BaseModelMixin):
70 70 
     )
71 71
72 72 
     request_id = ShortUUIDField(_(u'request_id'), max_length=32, blank=True, null=True, help_text=u'申请唯一标识', db_index=True, unique=True)
73 
+    admin_id = models.CharField(_(u'admin_id'), max_length=32, blank=True, null=True, help_text=u'经手人唯一标识', db_index=True)
74 
+
73 75 
     shot_id = models.CharField(_(u'shot_id'), max_length=32, blank=True, null=True, help_text=u'镜头唯一标识', db_index=True)
76 
+    model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'镜头型号唯一标识', db_index=True)
74 77
75 78 
     user_id = models.CharField(_(u'user_id'), max_length=32, blank=True, null=True, help_text=u'用户唯一标识', db_index=True)
76 79
80 
+    #镜头配件信息
81 
+    front_cap_status = models.BooleanField(_(u'front_cap_status'), default=False, help_text=u'前盖状态')
82 
+    rear_cap_status = models.BooleanField(_(u'rear_cap_status'), default=False, help_text=u'后盖状态')
83 
+    lens_hood_status = models.BooleanField(_(u'lens_hood_status'), default=False, help_text=u'遮光罩状态')
84 
+    tripod_ring_status = models.BooleanField(_(u'tripod_ring_status'), default=False, help_text=u'脚架环状态')
85 
+    appearance_performance_status = models.BooleanField(_(u'appearance_performance_status'), default=False, help_text=u'外观性能状态')
86 
+
77 87 
     # 身份证信息
78 88 
     identity_card_number = models.CharField(_(u'identity_card_number'), max_length=32, blank=True, null=True, help_text=u'身份证号')
79 89 
     identity_card_name = models.CharField(_(u'identity_card_name'), max_length=32, blank=True, null=True, help_text=u'身份证姓名')
 
@@ -132,6 +142,11 @@ class TenancyShotRequestInfo(BaseModelMixin):
132 142 
             'request_id': self.request_id,
133 143 
             'shot_id': self.shot_id,
134 144 
             'shot_info': shot.data if shot else {},
145 
+            'front_cap_status': self.front_cap_status,
146 
+            'rear_cap_status': self.rear_cap_status,
147 
+            'lens_hood_status': self.lens_hood_status,
148 
+            'tripod_ring_status': self.tripod_ring_status,
149 
+            'appearance_performance_status': self.appearance_performance_status,
135 150 
             'user_id': self.user_id,
136 151 
             'name': self.name,
137 152 
             'phone': self.phone,
 
@@ -159,14 +174,26 @@ class TenancyShotRequestInfo(BaseModelMixin):
159 174 
     @property
160 175 
     def admindata(self):
161 176 
         try:
162 
-            shot = TenancyShotInfo.objects.get(shot_id=self.shot_id)
177 
+            admin = AdministratorInfo.objects.get(admin_=self.admin)
178 
+        except AdministratorInfo.DoesNotExist:
179 
+            admin = None
180 
+
181 
+        try:
182 
+            shot = TenancyShotInfo.objects.get(shot_id=self.shot_id, status=True)
163 183 
         except TenancyShotInfo.DoesNotExist:
164 184 
             shot = None
185 
+
186 
+        try:
187 
+            model = ModelInfo.objects.get(model_id=self.model_id, status=True)
188 
+        except ModelInfo.DoesNotExist:
189 
+            model = None
190 
+
165 191 
         return {
166 192 
             'req_id': self.request_id,
167 193 
             'request_id': self.request_id,
168 194 
             'shot_id': self.shot_id,
169 195 
             'shot_info': shot.data if shot else {},
196 
+            'model_info': model.admindata,
170 197 
             'user_id': self.user_id,
171 198 
             'name': self.name,
172 199 
             'phone': self.phone,
 
@@ -189,4 +216,11 @@ class TenancyShotRequestInfo(BaseModelMixin):
189 216 
             'request_status': self.request_status,
190 217 
             'request_status_at': {k: tc.local_string(utc_dt=tc.string_to_utc_datetime(v, format='%Y-%m-%dT%H:%M:%S.%fZ')) for k, v in self.request_status_at.items()},
191 218 
             'created_at': tc.local_string(utc_dt=self.created_at),
219 
+            'admin_id': self.admin_id,
220 
+            'admin_data': admin.admindata if admin else {},
221 
+            'front_cap_status': self.front_cap_status,
222 
+            'rear_cap_status': self.rear_cap_status,
223 
+            'lens_hood_status': self.lens_hood_status,
224 
+            'tripod_ring_status': self.tripod_ring_status,
225 
+            'appearance_performance_status': self.appearance_performance_status,
192 226 
         }

kodo - Gogs: Go Git Service
首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0
工单管理 0 合并请求 0 提交历史 403 版本发布 0

暂无描述

ZIP TAR.GZ
Brightcells: d4c2c2a8d7 Change to use pywe-response 9 年之前
..
migrations 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api 9 年之前
__init__.py 7a17d0fb90 add api wxpay & add redis relative 10 年之前
admin.py 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api 9 年之前
models.py 0d046d557e Return order detail for api wx_order_detail_api 9 年之前
tests.py fabef63211 set line_length=200 for isort 9 年之前
views.py d4c2c2a8d7 Change to use pywe-response 9 年之前