diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 8523c53f..00eb3131 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -246,7 +246,12 @@ class ShopController extends BaseAuthedController {
             $this->_rspErr(2, "inapp purchase failed");
             return;
         }
-        if ($goodsMeta['shop_id'] != mt\Shop::INAPP_SHOP) {
+        if (!in_array($goodsMeta['shop_id'],
+                     array(
+                         mt\Shop::INAPP_SHOP_CEG,
+                         mt\Shop::INAPP_SHOP_DIAMOND
+                     )
+        )) {
             $this->_rspErr(3, "inapp purchase failed");
             return;
         }
@@ -263,7 +268,7 @@ class ShopController extends BaseAuthedController {
             return;
         }
         $price = $goodsMeta['price'];
-        if (empty($price) || $pirce < 0.001) {
+        if (empty($price) || $price < 0.001) {
             $this->_rspErr(1, "config error");
             return;
         }
@@ -277,7 +282,7 @@ class ShopController extends BaseAuthedController {
         );
         InAppRecord::addAmount($price);
         $this->_rspData(array(
-            'order_id' => $order_id,
+            'order_id' => $orderId,
         ));
     }
 
diff --git a/webapp/models/InAppOrder.php b/webapp/models/InAppOrder.php
index d546f56c..58a16cc2 100644
--- a/webapp/models/InAppOrder.php
+++ b/webapp/models/InAppOrder.php
@@ -17,7 +17,7 @@ class InAppOrder extends BaseModel {
     public static function find($orderId)
     {
         $row = SqlHelper::ormSelectOne(
-            myself()->_get(),
+            myself()->_getMysql(''),
             't_inapp_order',
             array(
                 'order_id' => $orderId,
@@ -29,7 +29,7 @@ class InAppOrder extends BaseModel {
     public static function add($orderId, $platform, $goodsId, $price)
     {
         SqlHelper::insert(
-            myself()->_get(),
+            myself()->_getMysql(''),
             't_inapp_order',
             array(
                 'order_id' => $orderId,
diff --git a/webapp/models/OrderId.php b/webapp/models/OrderId.php
index 415e6fb7..1a7b5606 100644
--- a/webapp/models/OrderId.php
+++ b/webapp/models/OrderId.php
@@ -4,6 +4,7 @@
 namespace models;
 
 
+use phpcommon;
 use phpcommon\SqlHelper;
 
 class OrderId {
@@ -20,7 +21,7 @@ class OrderId {
             )
         );
         $lastIdx = SqlHelper::getLastInsertId(myself()->_getSelfMysql());
-        $orderId = strftime('%Y%m%d%H%M%S', myself()->_getNowTime()) . pad($lastIdx % 100000, 5);
+        $orderId = strftime('%Y%m%d%H%M%S', myself()->_getNowTime()) . phpcommon\pad($lastIdx % 100000, 5);
         return $orderId;
     }
 
diff --git a/webapp/mt/Shop.php b/webapp/mt/Shop.php
index b03bcc31..30c82b60 100644
--- a/webapp/mt/Shop.php
+++ b/webapp/mt/Shop.php
@@ -43,7 +43,9 @@ class Shop {
     const WEEKLY_BUY_LIMIT = 2;
     const TOTAL_BUY_LIMIT = 3;
 
-    const INAPP_SHOP = 9;
+    const INAPP_SHOP_CEG = 7;
+    const INAPP_SHOP_DIAMOND = 9;
+
     const OUTSIDE_SHOP = 100;
 
     public static function get($id)