合并分支 'wangxiaogang' 到 'master'

Wangxiaogang



查看合并请求 !51

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

@@ -28,8 +28,9 @@ class LoadController extends HomeBaseController
     }
     public function test(){
         dump(cache('a1'));
-        dump(cache('dingyue1'));
         dump(cache('yuyue1'));
+        dump(cache('dingyue1'));
+        dump(cache('b'));
     }
     public function notify(){
         $RequestType = empty($_POST['RequestType']) ? 0: $_POST['RequestType'];

@@ -87,6 +87,9 @@ class PayController extends HomeBaseController
             $out_trade_no=$notify->out_trade_no;
             //查询订单信息
             $order = Db::name('indent')->where('order_number',$out_trade_no)->find();
+            if (!$order) { // 如果订单不存在
+                return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了
+            }
             if($successful){
 
                 $update['state'] = 2;