:art: TENANCY_TRACKING_***

huangqimin001 2 years ago
parent
commit
0cce0898b7
3 changed files with 7 additions and 7 deletions
  1. 1 1
      api/tenancy_admin_views.py
  2. 2 2
      api/tenancy_views.py
  3. 4 4
      tenancy/models.py

+ 1 - 1
api/tenancy_admin_views.py

@@ -224,7 +224,7 @@ def shot_request_signed(request, administrator):
224 224
     except TenancyShotRequestInfo.DoesNotExist:
225 225
         return response(TenancyStatusCode.TENANCY_SHOT_REQUEST_NOT_FOUND)
226 226
 
227
-    req.request_status = '寄回已签收并检查无损坏'
227
+    req.request_status = TenancyShotRequestInfo.TENANCY_TRACKING_BACK_SIGNED
228 228
     req.save()
229 229
 
230 230
     return response(data={

+ 2 - 2
api/tenancy_views.py

@@ -118,7 +118,7 @@ def shot_request_signed(request):
118 118
         return response(TenancyStatusCode.TENANCY_SHOT_REQUEST_NOT_FOUND)
119 119
 
120 120
     req.tracking_signed_images = signed_images
121
-    req.request_status = '寄出已签收'
121
+    req.request_status = TenancyShotRequestInfo.TENANCY_TRACKING_SEND_SIGNED
122 122
     req.save()
123 123
 
124 124
     return response(data={
@@ -141,7 +141,7 @@ def shot_request_sendback(request):
141 141
     old_back_tracking_number = req.back_tracking_number
142 142
 
143 143
     req.back_tracking_number = back_tracking_number
144
-    req.request_status = '寄回'
144
+    req.request_status = TenancyShotRequestInfo.TENANCY_TRACKING_BACK
145 145
     req.save()
146 146
 
147 147
     if back_tracking_number and back_tracking_number != old_back_tracking_number:

+ 4 - 4
tenancy/models.py

@@ -52,10 +52,10 @@ class TenancyShotInfo(BaseModelMixin):
52 52
 
53 53
 
54 54
 class TenancyShotRequestInfo(BaseModelMixin):
55
-    TRACKING_TO_DESPATCH = u'寄出'
56
-    TRACKING_SIGNED_FIXING = u'寄出已签收'
57
-    TRACKING_FIXED_BACK = u'寄回'
58
-    TRACKING_BACK_SIGNED = u'寄回已签收并检查无损坏'
55
+    TENANCY_TRACKING_SEND = u'寄出'
56
+    TENANCY_TRACKING_SEND_SIGNED = u'寄出已签收'
57
+    TENANCY_TRACKING_BACK = u'寄回'
58
+    TENANCY_TRACKING_BACK_SIGNED = u'寄回已签收并检查无损坏'
59 59
 
60 60
     AUDIT_PASS = 1
61 61
     AUDIT_STATUS = (