From 5534b2d8d448c3e12c48274499750a1a1ce878fa Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Fri, 5 Jan 2024 14:32:22 +0800
Subject: [PATCH] 1

---
 .../controller/HashRateController.class.php   |  5 ++++-
 webapp/models/HashRate.php                    | 22 +++++++++++++++++--
 webapp/services/HashRateService.php           | 15 -------------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/webapp/controller/HashRateController.class.php b/webapp/controller/HashRateController.class.php
index afe1f2ee..514dbde3 100644
--- a/webapp/controller/HashRateController.class.php
+++ b/webapp/controller/HashRateController.class.php
@@ -3,7 +3,9 @@ require_once('services/HashRateService.php');
 
 require_once('mt/AchievementsPower.php');
 require_once('mt/AchievementsCycle.php');
+require_once('models/HashRate.php');
 
+use models\HashRate;
 class HashRateController extends BaseAuthedController
 {
     private $hashRateService = null;
@@ -29,12 +31,13 @@ class HashRateController extends BaseAuthedController
         if ($obtain_end_time < myself()->_getNowTime()){
             $state = 1;
         }
+        $myHashRate = HashRate::getMyHashRate($currentPeriod['id']);
         $this->_rspData(array(
             'list' => $hashRateDtoList,
             'obtain_end_time' => $obtain_end_time,
             'income_end_time' => $income_end_time,
             'state' => $state,
-            'myHashRate' => 0,
+            'myHashRate' => $myHashRate,
         ));
     }
 
diff --git a/webapp/models/HashRate.php b/webapp/models/HashRate.php
index e4dee517..96ed56b8 100644
--- a/webapp/models/HashRate.php
+++ b/webapp/models/HashRate.php
@@ -10,7 +10,7 @@ class HashRate  extends BaseModel
     public static function find($taskId,$period){
         return SqlHelper::ormSelectOne(
             myself()->_getSelfMysql(),
-            't_hash_rate_task',
+            't_hash_rate',
             array(
                 'account_id' => myself()->_getAccountId(),
                 'task_id' => $taskId,
@@ -22,9 +22,27 @@ class HashRate  extends BaseModel
     public static function add($fieldKv){
         SqlHelper::insert(
             myself()->_getSelfMysql(),
-            't_hash_rate_task',
+            't_hash_rate',
             $fieldKv
         );
     }
 
+    public static function getMyHashRate($period){
+        $rows = SqlHelper::ormSelect(
+            myself()->_getSelfMysql(),
+            't_hash_rate',
+            array(
+                'account_id' => myself()->_getAccountId(),
+                'period' => $period,
+            )
+        );
+        $myHashRate = 0;
+        if ($rows){
+            foreach ($rows as $row){
+                $myHashRate += $row['reward'];
+            }
+        }
+        return $myHashRate;
+    }
+
 }
\ No newline at end of file
diff --git a/webapp/services/HashRateService.php b/webapp/services/HashRateService.php
index 83d3795a..10fa11c1 100644
--- a/webapp/services/HashRateService.php
+++ b/webapp/services/HashRateService.php
@@ -2,27 +2,12 @@
 
 
 namespace services;
-require_once('mt/HashRate.php');
-require_once('mt/Parameter.php');
-require_once('mt/HashRate.php');
-require_once('mt/Rank.php');
-require_once('mt/RankSeason.php');
-require_once('models/Bag.php');
-require_once('models/CrystalRecord.php');
-require_once('models/Staking.php');
 require_once('models/HashRate.php');
 require_once('models/HashRateBattleData.php');
 
-use models\Bag;
-use models\CrystalRecord;
 use models\HashRateBattleData;
-use models\Staking;
 use models\HashRate;
 use mt\AchievementsPower;
-use mt\Parameter;
-use mt\Rank;
-use mt\RankSeason;
-
 class HashRateService extends BaseService
 {
     const FINISHED_STATE = 1;