Merge branch 'master' of http://114.215.101.231:8099/anyv/xkeasy

@@ -212,9 +212,9 @@ class BirdController extends HomeBaseController
         $jsonResult = $this->orderTracesSubByJson($indent['order_number'],$indent['logistic_code'],$address);
         $jsonResult = $this->orderTracesSubByJson($indent['order_number'],$indent['logistic_code'],$address);
         $result = json_decode($jsonResult,true);
         $result = json_decode($jsonResult,true);
         if(empty($result['Reason'])){
         if(empty($result['Reason'])){
-            return dump($result);//订单轨迹
+            return ['code'=>20000,'msg'=>'SUCCESS'];//订单轨迹
         }else{
         }else{
-            return $result['Reason'];
+            return ['code'=>40000,'msg'=>$result['Reason']];
         }
         }
     }
     }
 
 

@@ -25,4 +25,9 @@ class LoadController extends HomeBaseController
             }
             }
         }
         }
     }
     }
+    public function notify(){
+        $param = $this->request->param();
+        cache($param);
+        echo 1;
+    }
 }
 }