ayHaru 4 years ago
parent
commit
e6b68bc1e9
2 changed files with 8 additions and 6 deletions
  1. 7 5
      application/index/controller/Order.php
  2. 1 1
      application/index/model/OrderModel.php

+ 7 - 5
application/index/controller/Order.php

@@ -21,11 +21,6 @@ class Order extends Base
 
         //商网接口
         $postData['orderCode'] = $order_sn;
-        $OrderModel = new OrderModel();
-        $order = $OrderModel->checkOrder($order_sn);
-        if(empty($order_sn)){
-            json_error(2006);
-        }
         $postData = json_encode($postData);
         $result = http_post_json(self::base_url . '/check' , $postData);
         if($result == false){
@@ -34,6 +29,13 @@ class Order extends Base
         $result = json_decode($result,true);
         if(!empty($result) && $result['code'] == 0) {
             $existed = $result['data']['isEffective'] != 0;
+            if($existed == true){
+                $OrderModel = new OrderModel();
+                $order = $OrderModel->checkOrder($order_sn);
+                if(!empty($order)){
+                    $existed = false;
+                }
+            }
             json_success(['order_sn' => $order_sn,'existed' => $existed]);
         }
         else {

+ 1 - 1
application/index/model/OrderModel.php

@@ -85,7 +85,7 @@ class OrderModel extends Model{
     }
 
     public function checkOrder($order_sn){
-        return $this->where(['order_sn' => $order_sn , 'order_status' => 1])->find();
+        return $this->where(['order_sn' => $order_sn])->find();
     }
 
     /**