1

doc/Shop.py

@@ -85,20 +85,6 @@ class Shop(object):
                     ['status', 0, '订单状态 0:未支付 1:已支付 2:支付失败'],
                 ]
             },
-            {
-                'name': 'getPayMethods',
-                'desc': '获取支付方式',
-                'group': 'Shop',
-                'url': 'webapp/index.php?c=Shop&a=getPayMethods',
-                'params': [
-                    _common.ReqHead(),
-                    ['token_type', 0, "选用币种"],
-                ],
-                'response': [
-                    _common.RspHead(),
-                    ['!pay_methods', [_common.PayMethod()], '支付方式列表'],
-                ]
-            },
             {
                 'name': 'boxPreview',
                 'desc': '宝箱道具预览',

webapp/controller/ShopController.class.php

@@ -2,48 +2,30 @@
 
 require_once('mt/Shop.php');
 require_once('mt/ShopGoods.php');
-require_once('mt/Hero.php');
 require_once('mt/Item.php');
 require_once('mt/Parameter.php');
-require_once('mt/Drop.php');
 require_once('mt/ShopChest.php');
 
-require_once('models/User.php');
 require_once('models/Hero.php');
-require_once('models/Bag.php');
-require_once('models/HeroSkin.php');
-require_once('models/Gun.php');
-require_once('models/GunSkin.php');
 require_once('models/ShopBuyRecord.php');
-require_once('models/Chip.php');
-require_once('models/BcOrder.php');
-require_once('models/Transaction.php');
+require_once('models/InAppOrder.php');
+require_once('models/OutAppOrder.php');
 
 require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
-require_once('services/BlockChainService.php');
 require_once('services/ShopService.php');
-
-require_once('phpcommon/bignumber.php');
-
 require_once('services/LogService.php');
-require_once('services/callback/ShopAddItemService.php');
 
-use models\User;
-use models\Bag;
-use models\Hero;
-use models\HeroSkin;
-use models\Gun;
-use models\GunSkin;
-use models\ShopBuyRecord;
-use models\Chip;
 use mt\Shop;
 use mt\ShopChest;
 use mt\ShopGoods;
-use models\Transaction;
-use models\BcOrder;
+
+use models\Hero;
+use models\ShopBuyRecord;
+use models\InAppOrder;
+use models\OutAppOrder;
+
 use services\LogService;
-use services\ShopAddItemService;
 use services\ShopService;
 
 class ShopController extends BaseAuthedController {
@@ -293,14 +275,18 @@ class ShopController extends BaseAuthedController {
 
     public function queryInappPurchase()
     {
-        $order_id = getReqVal('order_id', '');
-        $conn = myself()->_getMysql('');
-        $order = SqlHelper::selectOne($conn, 't_web2_order', array('item_id', 'item_num', 'status'), array('order_id' => $order_id));
-        if (!$order) {
-            $this->_rspErr(1, "order not found");
+        $orderId = getReqVal('order_id', '');
+        $orderDb = InAppOrder::find($orderId);
+        if ($orderDb) {
+            myself()->_rspErr(1, 'order not found');
             return;
         }
-        $this->_rspData($order);
+        $this->_rspData(array(
+            'order_id' => $orderDb['order_id'],
+            'item_id' => $orderDb['item_id'],
+            'item_num' => $orderDb['item_num'],
+            'status' => $orderDb['status'],
+        ));
     }
 
     public function boxPreview()

webapp/models/InAppOrder.php

@@ -7,4 +7,15 @@ use phpcommon\SqlHelper;
 
 class InAppOrder extends BaseModel {
 
+    public static function find($orderId) {
+        $row = SqlHelper::ormSelectOne(
+            myself()->_get(),
+            't_inapp_order',
+            array(
+                'order_id' => $orderId,
+            )
+        );
+        return $row;
+    }
+
 }