Home Explore Help
Register Sign In
Kodo
/
kodo
Watch 2
Star 0
Fork 0

Browse Source
Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron

FFIB 3 years ago
parent
e28308a246 51d86f0a06
commit
6360e98c59
2 changed files with 7 additions and 7 deletions
Show Diff Stats
  1. 2 2
      api/maintenance_views.py
  2. 5 5
      api/tenancy_admin_views.py

+ 2 - 2
api/maintenance_views.py
View File 

@@ -327,10 +327,10 @@ def maintenance_tracking_info(request):
327 327 
     tracking_info = {}
328 328 
     if type_ == 'tracking':
329 329 
         if maintenance.express_com and maintenance.tracking_number:
330 
-            tracking_info = KuaiDi100().track(maintenance.express_com, maintenance.tracking_number)
330 
+            tracking_info = KuaiDi100().track(maintenance.express_com, maintenance.tracking_number, phone=maintenance.phone)
331 331 
     else:
332 332 
         if maintenance.back_express_com and maintenance.back_tracking_number:
333 
-            tracking_info = KuaiDi100().track(maintenance.back_express_com, maintenance.back_tracking_number)
333 
+            tracking_info = KuaiDi100().track(maintenance.back_express_com, maintenance.back_tracking_number, phone=maintenance.phone)
334 334
335 335 
     if tracking_info:
336 336 
         try:

+ 5 - 5
api/tenancy_admin_views.py
View File 

@@ -325,17 +325,17 @@ def shot_request_tracking_info(request, administrator):
325 325 
     tracking_info = {}
326 326 
     if type_ == 'tracking':
327 327 
         if req.express_com and req.tracking_number:
328 
-            tracking_info = get_tracking_info(req.express_com, req.tracking_number)
328 
+            tracking_info = get_tracking_info(req.express_com, req.tracking_number, req.phone)
329 329 
             req.tracking_info = tracking_info
330 330 
             req.save()
331 331 
     else:
332 332 
         if req.back_express_com and req.back_tracking_number:
333 
-            tracking_info = get_tracking_info(req.back_express_com, req.back_tracking_number)
333 
+            tracking_info = get_tracking_info(req.back_express_com, req.back_tracking_number, req.phone)
334 334 
             req.back_tracking_info = tracking_info
335 335 
             req.save()
336 336
337 337 
     if tracking_info:
338 
-        tenancy_tracking_info_subscribe(req, 'tracking')
338 
+        tenancy_tracking_info_subscribe(req, type_)
339 339
340 340 
     return response(data={
341 341 
         'type': type_,
 
@@ -343,8 +343,8 @@ def shot_request_tracking_info(request, administrator):
343 343 
     })
344 344
345 345
346 
-def get_tracking_info(express_com, tracking_number):
347 
-    tracking_info = KuaiDi100().track(express_com, tracking_number)
346 
+def get_tracking_info(express_com, tracking_number, phone):
347 
+    tracking_info = KuaiDi100().track(express_com, tracking_number, phone=phone)
348 348 
     if tracking_info:
349 349 
         try:
350 350 
             tracking_info = json.loads(tracking_info)