From aa656832a547154e17833115cad804e1735bdd19 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 30 Aug 2023 13:40:04 +0800
Subject: [PATCH] 1

---
 webapp/controller/BaseController.class.php |  2 +-
 webapp/models/Staking.php                  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/webapp/controller/BaseController.class.php b/webapp/controller/BaseController.class.php
index b96a3a79..a2f5c065 100644
--- a/webapp/controller/BaseController.class.php
+++ b/webapp/controller/BaseController.class.php
@@ -49,7 +49,7 @@ class BaseController {
 
     public function _getNowDaySeconds()
     {
-        return $this->_getDaySeconds($this->nowtime);
+        return $this->_getDaySeconds($this->_getNowTime());
     }
 
     public function _getDaySeconds($time)
diff --git a/webapp/models/Staking.php b/webapp/models/Staking.php
index c4b9836b..74ad51f6 100644
--- a/webapp/models/Staking.php
+++ b/webapp/models/Staking.php
@@ -225,9 +225,20 @@ class Staking extends BaseModel {
         $dto['cec_rewards'] = 0;
         $dto['total_rewards'] = 0;
         if ($dto['status'] == self::REDEEM_STATUS) {
-            $stakedDays = intval(($dto['redeem_time'] - myself()->_getDaySeconds($row['start_time']) - 3600 * 24) / 3600 / 24);
+            $stakedDays = intval((myself()->_getDaySeconds($dto['redeem_time']) -
+                                  (myself()->_getDaySeconds($row['start_time']) + 3600 * 24)) / 3600 / 24);
             $stakedDays = max($stakedDays, 0);
             $stakedDays = min($stakedDays, $saveDays);
+            $dto['stacked_days'] = $stakedDays;
+            /*
+            if ($dto['stacked_days'] <= 0) {
+                error_log(json_encode(array(
+                    'src_stacked_days' => $stakedDays,
+                    'now_daySeocnds' => myself()->_getNowDaySeconds(),
+                    'now_time' => myself()->_getNowTime(),
+                    'redeem_time' => myself()->_getDaySeconds($dto['redeem_time'])
+                )));
+                }*/
             if ($saveDays >= 30 * 12 * 2) {
                 $stakedDays = max($stakedDays, 0);
                 $dto['cec_rewards'] = ($dto['cec_value'] * (0.6 / 30 / 12)) * min(30 * 12, $stakedDays) * 0.25;