XIAOPAN

@@ -198,6 +198,7 @@ class UsersController extends HomeBaseController{
     public function getOrder(){
     public function getOrder(){
         $users_id=$this->request->param('users_id');
         $users_id=$this->request->param('users_id');
         $map['state']=['neq',1];
         $map['state']=['neq',1];
+        $map['type']=1;
         $order=Db::name('order')->where(['users_id'=>$users_id,])->where($map)->order('id','desc')->paginate(8);
         $order=Db::name('order')->where(['users_id'=>$users_id,])->where($map)->order('id','desc')->paginate(8);
         $data_info=$order->items();
         $data_info=$order->items();
         foreach ($data_info as $k=>$v){
         foreach ($data_info as $k=>$v){
@@ -212,6 +213,71 @@ class UsersController extends HomeBaseController{
         ];
         ];
         $this->apiResponse(200,'success',$data);
         $this->apiResponse(200,'success',$data);
     }
     }
+
+
+
+    /**
+     * @title 用户充值列表
+     * @description 用户充值列表
+     * @author panhaowen
+     * @url /portal/users/getOrder2
+     * @method GET
+     *
+     * @param name:users_id type:String require:1 default:无 other: desc:用户id
+     * @param name:page type:String require:1 default:无 other: desc:页码
+     *
+     * @return currentPage:当前页
+     * @return allPage:总页数
+     * @return allData:总数据量
+     * @return data:当前页的数据（以下是数组字段）
+     *
+     * @return id:订单id
+     * @return order_no:订单号
+     * @return users_id:用户id
+     * @return start_time:开始使用时间
+     * @return price:金额（元）
+     * @return state:订单状态（1：没完成 2：已完成 3：已支付）
+     */
+    public function getOrder2(){
+        $users_id=$this->request->param('users_id');
+        $map['state']=3;
+        $map['type']=2;
+        $order=Db::name('order')->where(['users_id'=>$users_id,])->where($map)->order('start_time','desc')->paginate(8);
+        $this->apiResponse(200,'success',$order);
+    }
+
+
+    /**
+     * @title 用户提现列表
+     * @description 用户提现列表
+     * @author panhaowen
+     * @url /portal/users/getOrder3
+     * @method GET
+     *
+     * @param name:users_id type:String require:1 default:无 other: desc:用户id
+     * @param name:page type:String require:1 default:无 other: desc:页码
+     *
+     * @return currentPage:当前页
+     * @return allPage:总页数
+     * @return allData:总数据量
+     * @return data:当前页的数据（以下是数组字段）
+     *
+     * @return id:订单id
+     * @return order_no:订单号
+     * @return users_id:用户id
+     * @return start_time:开始使用时间
+     * @return money:金额（元）
+     */
+    public function getOrder3(){
+        $users_id=$this->request->param('users_id');
+        $data=Db::name('withdraw')->where([
+            'user_id'=>$users_id,
+        ])->paginate(6);
+        $this->apiResponse(200,'success',$data);
+    }
+
+
+
     /**
     /**
      * @title 用户查询未完成订单信息
      * @title 用户查询未完成订单信息
      * @description 用户查询在使用订单信息
      * @description 用户查询在使用订单信息