From 24bcbe531a60386d0202f6ece18c010edb732959 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 11 Oct 2024 10:40:28 +0800
Subject: [PATCH] 1

---
 webapp/controller/HashRateShopController.class.php | 6 ++++--
 webapp/models/HashRate.php                         | 2 ++
 webapp/models/HashRateShopBuyRecord.php            | 2 +-
 webapp/services/HashRateShopService.php            | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp/controller/HashRateShopController.class.php b/webapp/controller/HashRateShopController.class.php
index 80d1fd06..d7739388 100644
--- a/webapp/controller/HashRateShopController.class.php
+++ b/webapp/controller/HashRateShopController.class.php
@@ -8,6 +8,7 @@ require_once('mt/HashRateShop.php');
 require_once('mt/Item.php');
 
 require_once('models/HashRate.php');
+require_once('models/HashRateShopBuyRecord.php');
 
 use phpcommon\SqlHelper;
 
@@ -82,14 +83,15 @@ class HashRateShopController extends BaseAuthedController {
             return;
         }
         models\HashRate::decMyCurrentHashRate($price * $goodsNum);
-        HashRateShopBuyRecord::add($goodsMeta['goods_id'], $goodsNum, $goodsMeta['type']);
+        models\HashRateShopBuyRecord::add($goodsMeta['id'], $goodsNum, $goodsMeta['type']);
+        /*
         for ($i = 0; $i < $goodsNum; $i++) {
             $this->internalAddItem($awardService,
                 $propertyChgService,
                 $itemMeta,
                 $goodsMeta['item_num']
             );
-        }
+            }*/
         $propertyChgService->addUserChg();
         $this->_rspData(
             array(
diff --git a/webapp/models/HashRate.php b/webapp/models/HashRate.php
index 61acb1dc..1e22f6a0 100644
--- a/webapp/models/HashRate.php
+++ b/webapp/models/HashRate.php
@@ -139,6 +139,8 @@ class HashRate  extends BaseModel
                 array(
                     'account_id' => myself()->_getAccountId(),
                     'period' => $currentPeriod['id'],
+                ),
+                array(
                     'reward' => function () use($val) {
                         return "GREATEST(0, reward - ${val})";
                     },
diff --git a/webapp/models/HashRateShopBuyRecord.php b/webapp/models/HashRateShopBuyRecord.php
index b37dcbdb..e055bad8 100644
--- a/webapp/models/HashRateShopBuyRecord.php
+++ b/webapp/models/HashRateShopBuyRecord.php
@@ -84,7 +84,7 @@ class HashRateShopBuyRecord extends BaseModel
                     return "CASE WHEN (${cond}) THEN this_month_buy_times + ${goodsNum} ELSE 0 END";
                 },
                 'total_buy_times' => function () use($goodsNum) {
-                    return 'total_buy_times + ${goodsNum}';
+                    return "total_buy_times + ${goodsNum}";
                 },
                 'last_buy_time' => myself()->_getNowTime(),
                 'modifytime' => myself()->_getNowTime(),
diff --git a/webapp/services/HashRateShopService.php b/webapp/services/HashRateShopService.php
index 55e8395b..ab91a4d9 100644
--- a/webapp/services/HashRateShopService.php
+++ b/webapp/services/HashRateShopService.php
@@ -74,7 +74,7 @@ class HashRateShopService {
         $errMsg = '';
         $buyRecordHash = HashRateShopBuyRecord::allToHash();
         $boughtTimes = 1;
-        $goodsId = $goodsMeta['goods_id'];
+        $goodsId = $goodsMeta['id'];
         {
             switch ($goodsMeta['limit_type']) {
                 case mt\HashRateShop::DAILY_BUY_LIMIT: {