dever 6 years ago
parent
commit
bdd0f62cac
2 changed files with 6 additions and 4 deletions
  1. 4 3
      act/src/Order.php
  2. 2 1
      buy/src/Buy.php

+ 4 - 3
act/src/Order.php

@@ -164,7 +164,7 @@ class Order extends Core
 
         $where = array();
         $where['create_uid'] = $this->data['uid'];
-        $where['order_id'] = $order_id;
+        $where['order_id'] = $order['order_id'];
         $where['type'] = 4;
 
         Dever::setInput('set_product_id', $order['product_id']);
@@ -289,8 +289,8 @@ class Order extends Core
             }
         }
 
-        //$this->data['order_id'] = $order_id;
-        $this->data['order_id'] = $id;
+        $this->data['order_id'] = $order_id;
+        //$this->data['order_id'] = $id;
 
         return $this->data;
     }
@@ -453,6 +453,7 @@ class Order extends Core
             $order = Dever::db('act/order')->one(array('order_id' => $order_id));
         } else {
             $order = Dever::db('act/order')->one($order_id);
+            $order['order_id'] = $order['id'];
         }
 
         return $order;

+ 2 - 1
buy/src/Buy.php

@@ -85,13 +85,14 @@ class Buy extends Base
     {
         $where['cate_id'] = $this->cate;
         $where['create_uid'] = $this->user['id'];
-        $where['order_id'] = Dever::input('order_id');
+        
         if (!$where['order_id']) {
             Dever::alert('错误的订单');
         }
         $where['type'] = 4;
         $order = Dever::load('act/order')->getOrder($where['order_id']);
         Dever::setInput('set_product_id', $order['product_id']);
+        $where['order_id'] = $order['order_id'];
         $data = Dever::db('code/info')->getAll($where);
 
         if ($data) {