afa 9 сар өмнө
parent
commit
6ea5012080

+ 1 - 1
application/api/controller/Order.php

@@ -180,7 +180,7 @@ class Order extends Api
             $popular_order = $productOrder->where('id', $order_info['order_id'])->find();
 
             // 生成订单
-            $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Transfer, $this->auth->id, $order_info['user_id'], $order_info->order_no, $order_info['fees'], $popular_order->popular_price);
+            $productOrder::setCreateOrder($params['order_id'], $order_info, $productOrder::Transfer, $this->auth->id, $order_info['user_id'], $popular_order->order_no, $order_info['fees'], $popular_order->popular_price);
            
             //扣除余额记录 
             $ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::TOKEN, -$order_info['price'], $ledgerWalletModel::Payment, $order_info['user_id']);

+ 1 - 1
application/api/controller/User.php

@@ -219,7 +219,7 @@ class User extends Api
         $where = [];
         switch ($typeId) {
             case 0:
-                $where['a.status'] = ['<' , $productOrder::Shipped];
+                $where['a.status'] = ['=' , $productOrder::Paid];
                 break;
             case 1:
                 $where = ['a.type_id' => $productOrder::Transfer, 'a.status' => $productOrder::Transferred];

+ 1 - 1
application/common/model/ProductOrder.php

@@ -51,7 +51,7 @@ class ProductOrder extends Model
 
 
     //抢购下单:未选择地区购买
-    public static function setPopularNoAreaOrder($num, $order_id, $price, $product_id, $uid)
+    public static function setPopularNoAreaOrder($num, $order_id, $price, $product_id, $uid):bool
     {
         for ($i = 0; $i < $num; $i++) {
             $order_arr['price']     = $price;