diff --git a/app/ros/controller/Index.php b/app/ros/controller/Index.php
index 3053ad8..5862c40 100644
--- a/app/ros/controller/Index.php
+++ b/app/ros/controller/Index.php
@@ -10,7 +10,7 @@ class Index
     public function getList() {
         $product_model = new ProductModel();
 
-        $list = $product_model->getList([],'*','id asc');
+        $list = $product_model->getList(['status' => 1],'*','id asc');
         echo json_encode($list);
     }
 }
\ No newline at end of file
diff --git a/app/ros/controller/Order.php b/app/ros/controller/Order.php
index 8600c82..dbff905 100644
--- a/app/ros/controller/Order.php
+++ b/app/ros/controller/Order.php
@@ -12,6 +12,47 @@ use app\user\model\UserScore as UserScore;
 
 class Order extends Controller
 {
+
+    /**
+     * @description: 获取订单列表 前台用户
+     * @param {*}
+     * @return {*}
+     */    
+    public function getList() {
+        $order_model = new OrderModel();
+        $userid = $this->userinfo['UserId'];
+        $list = $order_model->getListPage(['user_id' => $userid,'status' => 1]);
+
+        $info = [
+            'code'=>1,
+            'data' => $list
+        ];
+        echo  json_encode($info);
+        die;
+    }
+
+    /**
+     * @description: 获取订单列表 所有用户
+     * @param {*}
+     * @return {*}
+     */    
+    public function getAllList() {
+        $page = 0;
+        if (isset($_GET['page'])) {
+            $page = ($_GET['page'] - 1) * 50;
+        }
+        $order_model = new OrderModel();
+        $list = $order_model->getListPage(['status' => 1],'*','id desc',"$page,50");
+
+        $info = [
+            'Code'=>10000,
+            'Data' => $list,
+            'Count' => (int)$order_model->getCount(['status' => 1])
+        ];
+        echo  json_encode($info);
+        die;
+    }
+
     /**
      * @description: 支付宝付款
      * @param {*}
@@ -33,6 +74,7 @@ class Order extends Controller
 
         $order_data = [
             'user_id' => $this->userinfo['UserId'],
+            'username' => $this->userinfo['LoginName'],
             'product_id' => $product_info['id'],
             'product_name' => $product_info['name'],
             'order_price' => $product_info['price'],
@@ -83,6 +125,7 @@ class Order extends Controller
 
         $order_data = [
             'user_id' => $this->userinfo['UserId'],
+            'username' => $this->userinfo['LoginName'],
             'product_id' => $product_info['id'],
             'product_name' => $product_info['name'],
             'order_price' => $product_info['price'],
@@ -148,6 +191,7 @@ class Order extends Controller
                 $score_model = new UserScore;
                 $score_data = [
                     'UserId' => $this->userinfo['UserId'],
+                    'username' => $this->userinfo['LoginName'],
                     'ScoreType' => '6',
                     'ScoreTypeName' => '购买软路由',
                     'ScoreValue' => $money,
diff --git a/app/ros/controller/Product.php b/app/ros/controller/Product.php
index 2baa254..d722243 100644
--- a/app/ros/controller/Product.php
+++ b/app/ros/controller/Product.php
@@ -9,10 +9,49 @@ use fastphp\base\Controller;
 class Product extends Controller
 {
     //获取产品列表
-    public function getBuyerInfo() {
-        $buyer_model = new BuyerModel();
+    public function getList() {
+        $product_model = new ProductModel();
 
-        $info = $buyer_model->getOne(['user_id'=>$this->userinfo['UserId']]);
+        $list = $product_model->getList([],'*','id asc');
+        $info = [
+            'Code' => 10000,
+            'TotalCount' => count($list),
+            'Data' => $list
+        ];
+        echo json_encode($info);
+    }
+
+    /**
+     * @description: 修改状态
+     * @param {*}
+     * @return {*}
+     */    
+    public function setStatus() {
+        $data = json_decode(file_get_contents("php://input"),true);
+        $product_model = new ProductModel();
+        $product_model->updateOne(['id'=>$data['id']],['status'=>$data['status']]);
+
+        $info = [
+            'Code' => 10000,
+        ];
+        echo json_encode($info);
+    }
+
+    /**
+     * @description: 修改产品信息
+     * @param {*}
+     * @return {*}
+     */    
+    public function setInfo() {
+        $data = json_decode(file_get_contents("php://input"),true);
+        $product_model = new ProductModel();
+        $update_data = $data;
+        unset($update_data['id']);
+        $product_model->updateOne(['id'=>$data['id']],$update_data);
+
+        $info = [
+            'Code' => 10000,
+        ];
         echo json_encode($info);
     }
 }
\ No newline at end of file