瀏覽代碼

转让购买

afa 11 月之前
父節點
當前提交
2241fa33fa
共有 4 個文件被更改,包括 7 次插入6 次删除
  1. 0 0
      11.txt
  2. 2 1
      application/api/controller/Home.php
  3. 4 5
      application/api/controller/Order.php
  4. 1 0
      application/api/controller/Product.php

文件差異過大導致無法顯示
+ 0 - 0
11.txt


+ 2 - 1
application/api/controller/Home.php

@@ -76,6 +76,7 @@ class Home extends Api
            ->join("product_list b", "a.product_id = b.id", "left")
            ->field('a.id,'.'b.'.$this->lan.'_name,b.thum as img_url,price,cost_price,stock,num,start_time,end_time')
            ->limit(2)
+           ->where('a.status', '<', $productPopular::STOP)
            ->order('a.weigh desc')
            ->select();
 
@@ -85,7 +86,7 @@ class Home extends Api
             ->join("user u", "a.user_id = u.id", "left")
             ->join("products d", "b.type_id = d.id", "left")
             ->field('a.id,'.'b.'.$this->lan.'_name,b.thum as img_url,price,u.nickname,d.'.$this->lan.'_title')
-            ->where('a.status', 1)
+            ->where('a.status', $productTransfer::NORMAL)
             ->limit(2)
             ->order('a.id DESC')
             ->select();

+ 4 - 5
application/api/controller/Order.php

@@ -159,19 +159,15 @@ class Order extends Api
         //启动事务
         Db::startTrans();
         try {
-       
-
 
             $order_info = $productTransfer->where('id', $params['order_id'])->where('status', $productTransfer::NORMAL)->find();
-
-            dump($order_info );die;
             if(empty($order_info)) throw new Exception(__("订单不存在"));
             if(bccomp($order_info['price'], $this->auth->balance, 2) > 0) throw new Exception(__("余额不足请前往充值"));
 
             $order_data['order_id']  = $params['order_id'];
             $order_data['product_id']= $order_info['product_id'];
             $order_data['type_id']   = $productOrder::Transfer;
-            $order_data['status']    = $productOrder::Complete;
+            $order_data['status']    = $productOrder::Paid;
             $order_data['area_id']   = $order_info['area_id'];
             $order_data['user_id']   = $this->auth->id;
             
@@ -193,6 +189,9 @@ class Order extends Api
                     $atBalance,
                     bcadd($atBalance, $amount, 2),
                     $order->id);
+
+            //修改原订单状态
+            $productOrder->where('id', $params['order_id'])->setField('status', $productOrder::Complete);    
             //修改状态
             $order_info->status = $productTransfer::STOP;
             $order_info->save();

+ 1 - 0
application/api/controller/Product.php

@@ -30,6 +30,7 @@ class Product extends Api
             $pro = $productPopular->alias('a')
                 ->join("product_list b", "a.product_id = b.id", "left")
                 ->field('a.id,'.'b.'.$this->lan.'_name,b.thum as img_url,price,cost_price,stock,num,start_time,end_time')
+                ->where('a.status', '<', $productPopular::STOP)
                 ->where('b.type_id', $kk)
                 ->order('a.weigh desc')
                 ->select();

部分文件因文件數量過多而無法顯示