From 09b5517baa7947763cdd1768bd8e5f0bbc27c39a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 4 Aug 2023 20:04:44 +0800
Subject: [PATCH] 1

---
 webapp/controller/BlockChainController.class.php | 11 +++++++++++
 webapp/controller/ShopController.class.php       |  9 ++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/webapp/controller/BlockChainController.class.php b/webapp/controller/BlockChainController.class.php
index 986ff4a3..0c1b3187 100644
--- a/webapp/controller/BlockChainController.class.php
+++ b/webapp/controller/BlockChainController.class.php
@@ -14,6 +14,7 @@ require_once('models/Transaction.php');
 require_once('models/BuyRecord.php');
 require_once('models/Chip.php');
 require_once('models/TransactionPrefee.php');
+require_once('models/BcOrder.php');
 
 require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
@@ -28,6 +29,7 @@ use models\Nft;
 use models\Transaction;
 use models\BuyRecord;
 use models\Chip;
+use models\BcOrder;
 use models\TransactionPrefee;
 
 use services\BlockChainService;
@@ -285,6 +287,7 @@ class BlockChainController extends BaseAuthedController {
 
     public function buyDiamond()
     {
+        error_log(json_encode($_REQUEST));
         $num = getReqVal('num', 0);
         $tokenType = getReqVal('token_type', '');
         if (!is_numeric($num)) {
@@ -330,6 +333,14 @@ class BlockChainController extends BaseAuthedController {
             )),
         ));
 
+        error_log(json_encode(
+            array(
+                'trans_id' => $rspObj['trans_id'],
+                'params' => $rspObj['params'],
+                'item_id' => $itemId,
+                'item_num' => $itemCount
+            )
+        ));
         myself()->_rspData(
             array(
                 'trans_id' => $rspObj['trans_id'],
diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 256698ba..2fbe6579 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -333,14 +333,17 @@ class ShopController extends BaseAuthedController {
     {
         $orderId = getReqVal('order_id', '');
         $orderDb = InAppOrder::find($orderId);
-        if ($orderDb) {
+        if (!$orderDb) {
             myself()->_rspErr(1, 'order not found');
             return;
         }
+        $goodsMeta = mt\ShopGoods::get($orderDb['goods_id']);
+        error_log(json_encode($orderDb));
+        error_log(json_encode($goodsMeta));
         $this->_rspData(array(
             'order_id' => $orderDb['order_id'],
-            'item_id' => $orderDb['item_id'],
-            'item_num' => $orderDb['item_num'],
+            'item_id' => $goodsMeta['item_id'],
+            'item_num' => $goodsMeta['item_num'],
             'status' => $orderDb['status'],
         ));
     }