From 12ae76c4bfc299b06cef9cb75eac0565ee00c94a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 4 Apr 2022 17:20:29 +0800
Subject: [PATCH] 1

---
 webapp/controller/MarketController.class.php | 22 ++++++++++----------
 webapp/models/BuyRecord.php                  |  2 +-
 webapp/mt/BcShopGoods.php                    |  7 +++++++
 webapp/mt/MarketGoods.php                    |  7 +++++++
 webapp/services/MarketService.php            |  6 ++++++
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/webapp/controller/MarketController.class.php b/webapp/controller/MarketController.class.php
index 259e263f..ffb2ccb3 100644
--- a/webapp/controller/MarketController.class.php
+++ b/webapp/controller/MarketController.class.php
@@ -156,7 +156,7 @@ class MarketController extends BaseController {
         }
         $itemMeta = mt\Item::get($itemId);
         if (!$itemMeta) {
-            myself()->_rspErr(500, 'server internal error');
+            myself()->_rspErr(500, 'server internal error11');
             return;
         }
         $currencyMeta = mt\Currency::get($goodsMeta['currency_id']);
@@ -166,17 +166,17 @@ class MarketController extends BaseController {
         }
 
         if (!phpcommon\isValidBcGameId($gameId)) {
-            myself()->_rspErr(500, 'server internal error');
+            myself()->_rspErr(500, 'server internal error12');
             return;
         }
 
         if (!phpcommon\isValidBcTime(myself()->_getNowTime())) {
-            myself()->_rspErr(500, 'server internal error');
+            myself()->_rspErr(500, 'server internal error13');
             return;
         }
 
         if (!phpcommon\isValidBcFuncId($funcId)) {
-            myself()->_rspErr(500, 'server internal error');
+            myself()->_rspErr(500, 'server internal error14');
             return;
         }
 
@@ -185,6 +185,10 @@ class MarketController extends BaseController {
             myself()->_rspErr(1, 'account can only choose 1 hero to purchase');
             return;
         }
+        $orderId = BuyRecord::genOrderId($gameId,
+                                         $funcId,
+                                         myself()->_getNowTime(),
+                                         $buyerAddress);
 
         $fieldsKv = array(
                 'game_id' => $gameId,
@@ -208,18 +212,14 @@ class MarketController extends BaseController {
             if ($i <= count($items)) {
                 $tokenId = phpcommon\setOrderIdSubIdx($orderId, $i);
                 $fieldsKv['bc_mint_tokenid' . $i] = $tokenId;
-                $fieldsKv['bc_mint_need' . $i] = $items[$i]['need'];
-                $fieldsKv['bc_mint_itemid' . $i] = $items[$i]['item_id'];
-                $fieldsKv['bc_mint_token_type' . $i] = $items[$i]['token_type'];
+                $fieldsKv['bc_mint_need' . $i] = $items[$i - 1]['need'];
+                $fieldsKv['bc_mint_itemid' . $i] = $items[$i - 1]['item_id'];
+                $fieldsKv['bc_mint_token_type' . $i] = $items[$i - 1]['token_type'];
             }
         }
         if (MarketService::isTestMode()) {
             $fieldsKv['bc_paid'] = 1;
         }
-        $orderId = BuyRecord::genOrderId($gameId,
-                                         $funcId,
-                                         myself()->_getNowTime(),
-                                         $buyerAddress);
         $fieldsKv['order_id'] = $orderId;
         SqlHelper::insert(
             myself()->_getMarketMysql(),
diff --git a/webapp/models/BuyRecord.php b/webapp/models/BuyRecord.php
index 30deb041..0de0525f 100644
--- a/webapp/models/BuyRecord.php
+++ b/webapp/models/BuyRecord.php
@@ -29,7 +29,7 @@ class BuyRecord extends BaseModel {
                 'errmsg' => 'server internal error'
             )));
         }
-        $orderId = phpcommon\genOrderId($gameId, $funcId, $time, $lastIdx, 0);
+        $orderId = phpcommon\genOrderId($gameId, $funcId, $time, 0, $lastIdx);
         if (!phpcommon\isValidOrderId($orderId)) {
             die(json_encode(array(
                 'errcode' => 500,
diff --git a/webapp/mt/BcShopGoods.php b/webapp/mt/BcShopGoods.php
index 8463580a..b35ea9f6 100644
--- a/webapp/mt/BcShopGoods.php
+++ b/webapp/mt/BcShopGoods.php
@@ -11,6 +11,13 @@ class MarketGoods {
         return getXVal(self::getMetaList(), $id, null);
     }
 
+    public static function traverseMeta($cb)
+    {
+        foreach (self::getMetaList() as $meta) {
+            $cb($meta);
+        }
+    }
+
     public static function getBatchMetas($batchId)
     {
         self::mustBeBatchHash();
diff --git a/webapp/mt/MarketGoods.php b/webapp/mt/MarketGoods.php
index 07a921ee..2f6db2f9 100644
--- a/webapp/mt/MarketGoods.php
+++ b/webapp/mt/MarketGoods.php
@@ -11,6 +11,13 @@ class MarketGoods {
         return getXVal(self::getMetaList(), $id, null);
     }
 
+    public static function traverseMeta($cb)
+    {
+        foreach (self::getMetaList() as $meta) {
+            $cb($meta);
+        }
+    }
+
     public static function getBatchMetas($batchId)
     {
         self::mustBeBatchHash();
diff --git a/webapp/services/MarketService.php b/webapp/services/MarketService.php
index b4a0d817..a7778e25 100644
--- a/webapp/services/MarketService.php
+++ b/webapp/services/MarketService.php
@@ -10,11 +10,14 @@ require_once('mt/WhiteList.php');
 require_once('mt/Currency.php');
 require_once('mt/Hero.php');
 require_once('mt/Parameter.php');
+require_once('mt/StrHelper.php');
+require_once('mt/AttrHelper.php');
 
 require_once('models/BoxOrder.php');
 require_once('models/Nft.php');
 require_once('models/BuyRecord.php');
 
+
 require_once('phpcommon/bchelper.php');
 
 use phpcommon;
@@ -22,6 +25,9 @@ use phpcommon\SqlHelper;
 use models\BoxOrder;
 use models\Nft;
 use models\BuyRecord;
+use mt;
+use mt\StrHelper;
+use mt\AtrrHelper;
 
 class MarketService extends BaseService {