nft列表

application/api/controller/Order.php

@@ -140,13 +140,14 @@ class Order extends Api
             $min_transfer = $productPopular::where('id', $order_info->order_id)->value('min_transfer');
             if(bccomp($params['price'],$min_transfer, 2) < 0) throw new Exception(__("当前订单最低转让金额为").$min_transfer);
 
-            //转让订单  min_transfer
+            //转让订单
             $fee = getConfig('transfer_fee');
             $feeAmount = bcmul($params['price'], $fee, 2) ;
             $productTransfer::setTransferOrder($this->auth->id, $order_info['product_id'], $order_info['area_id'], $feeAmount, $params);
 
-            //修改状态
-            $order_info->status = $productOrder::Transferred;
+            //修改 类型状态
+            $order_info->type_id = $productOrder::Transfer;
+            $order_info->status  = $productOrder::Transferred;
             $order_info->save();
             Db::commit();
         } catch (Exception $e) {
@@ -235,7 +236,9 @@ class Order extends Api
             //扣除Rwa有效-1
             $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, 1, '-');
 
-            $order_info->status= $productOrder::Closure; 
+            //修改：类型状态
+            $order_info->type_id= $productOrder::Giveaway; 
+            $order_info->status = $productOrder::Closure; 
             $order_info->save();
 
             // 提交事务
@@ -265,7 +268,9 @@ class Order extends Api
             //转让列表取消
             $productTransfer::where('order_id',$params['order_id'])->setField('status', $productTransfer::STOP);
 
-            $order_info->status= $productOrder::Paid; 
+            //修改:类型状态
+            $order_info->type_id= $productOrder::Popular; 
+            $order_info->status = $productOrder::Paid; 
             $order_info->save();
             // 提交事务
             Db::commit();

application/api/controller/User.php

@@ -39,11 +39,6 @@ class User extends Api
     public function userInfo()
     {
         $user = $this->auth->getUser();
-        $teamLevelName = '';
-        $teamLevelInfo = (new TeamLevelModel())->get($user['team_level_id']);
-        if (!empty($teamLevelInfo)) {
-            $teamLevelName = $teamLevelInfo->toArray()['name'];
-        }
         $resp = [
             'id'              => $user['id'],
             'nickname'        => $user['nickname'],
@@ -55,8 +50,7 @@ class User extends Api
             'rental_power'    => '0', // 自己购买的算力
             'team_power'      => '0', // 团队总算里
             'balance'         => LedgerWalletModel::getWalletChaBao($this->auth->id), // 余额
-            'team_level_id'   => $user['team_level_id'], // 团队等级ID
-            'team_level_name' => $teamLevelName, // 团队等级名称
+            'rwa_num'         => $user['rwa_num'], // 总茶权
             'parent_id'       => $user['parent_id'], // 上级ID
             'parent_address'  => '', // 上级的地址
             'invite_link'     => Config::get('rental.invite_domain') . '/?inviteCode=' . $user['address'],
@@ -66,18 +60,38 @@ class User extends Api
     }
 
     /**
-     * 获取Nft列表   transfer_price
+     * 获取Nft列表   
+     * param int $type_id 0总览 1转让中 2已转让 3存储中 4已赠送 5已提货
      * @return void
      */
     public function getNftList(ProductOrder $productOrder)
     {
+        $where = [];
+        $typeId = $this->request->post('type_id/d', 0);
+        switch ($typeId) {
+            case 1:
+                $where = ['a.type_id' => $productOrder::Transfer, 'a.status' => $productOrder::Transferred];
+                break;
+            case 2:
+                $where = ['a.type_id' => $productOrder::Transfer, 'a.status' => $productOrder::Closure];
+                break;
+            case 3:
+                $where = ['a.type_id' => $productOrder::Popular, 'a.status' => $productOrder::Cancelled];
+                break;
+            case 4:
+                $where = ['a.type_id' => $productOrder::Giveaway, 'a.status' => $productOrder::Cancelled];
+                break;
+            case 5:
+                $where = ['a.type_id' => $productOrder::Popular, 'a.status' => $productOrder::Shipped];
+                break;
+        }
         $list = $productOrder->alias('a')
               ->join("product_list b", "b.id = a.product_id", "left")
               ->join("products c", "c.id = b.type_id", "left")
               ->join("product_transfer z", "a.id = z.order_id AND a.status=2", "left") //转让
               ->join("product_area d", "d.id = a.area_id", "left") //地区
               ->field('a.id as order_id,a.product_id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.status,a.type_id,c.'.$this->lan.'_title as title,z.price as transfer_price,d.address')
-              ->where('a.user_id', $this->auth->id)
+              ->where('a.user_id', $this->auth->id)->where($where)
               ->order('a.id DESC')
               ->paginate($this->pageSize);
         $this->success('', $list);