diff --git a/doc/Shop.py b/doc/Shop.py
index 4077fd2e..5d75efbf 100644
--- a/doc/Shop.py
+++ b/doc/Shop.py
@@ -86,6 +86,7 @@ class Shop(object):
                 'params': [
                     _common.ReqHead(),
                     ['id', 0, '商品唯一id，参见shopGoods表'],
+                    ['token_type', '', "选用币种"]
                     ['goods_num', 0, '商品数量'],
                 ],
                 'response': [
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 7253e844..1768027b 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -29,17 +29,42 @@ class ShopController extends BaseAuthedController {
 
     public function getGoodsList()
     {
-        echo 'getGoodsList';
+        $row = SqlHelper::ormSelect(
+            $this->_getSelfMysql(),
+            't_shop_goods'
+        );
+        $this->_rspData(array(
+            'goods_list' => $row ? $row : array(),
+        ));
     }
 
     public function getShopNames()
     {
-        echo 'getShopNames';
+        $row = SqlHelper::ormSelect(
+            $this->_getSelfMysql(),
+            't_shop_names'
+        );
+        $this->_rspData(array(
+            'shop_name_list' => $row ? $row : array(),
+        ));
     }
 
     public function buyGoodsNew()
     {
-        echo 'buyGoodsNew';
+        $id = getReqVal('id', 0);
+        $num = getReqVal('goods_num', 0);
+        
+        $row = SqlHelper::ormSelectOne(
+            $this->_getSelfMysql(),
+            't_shop_goods',
+            array(
+                'id' => $id,
+            )
+        );
+        $this->_rspData(array(
+            'p1' => $id,
+            'p2' => $row ? $row : array(),
+        ));
     }
 
     public function info()