From 1c93734ae0a4719f222a72287fd69326124b9750 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 14 Aug 2023 16:23:03 +0800
Subject: [PATCH] 1

---
 .../controller/FirstTopupController.class.php | 40 +++++++++----------
 webapp/models/FirstTopup.php                  |  2 +-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/webapp/controller/FirstTopupController.class.php b/webapp/controller/FirstTopupController.class.php
index 99f355c1..391dd9d9 100644
--- a/webapp/controller/FirstTopupController.class.php
+++ b/webapp/controller/FirstTopupController.class.php
@@ -31,15 +31,7 @@ class FirstTopupController extends BaseAuthedController {
         }
         FirstTopup::adjustStatus($dbInfo);
         $complete = 1;
-        for ($i = 1; $i <= 3; ++$i) {
-            if ($dbInfo['status' . $i] != 2) {
-                $complete = 0;
-            }
-            $status[$i] = $dbInfo['status' . $i];
-        }
-        if ($complete == 1 && myself()->_getV(TN_FIRST_TUPOP_STATUS, 0) == 0) {
-            myself()->_setV(TN_FIRST_TUPOP_STATUS, 0, 1);
-        }
+        $this->fillStatus($dbInfo, $status, $complete);
         $this->_rspData(
             array(
                 'complete' => $complete,
@@ -83,22 +75,14 @@ class FirstTopupController extends BaseAuthedController {
         for ($i = 0; $i < count($reward); $i++) {
             array_push($awardItems,
                        array(
-                           $item['goods_id'],
-                           $item['goods_num']
+                           'item_id' => $item['goods_id'],
+                           'item_num' => $item['goods_num']
                        ));
         }
         myself()->_addItems($awardItems, $awardService, $propertyChgService);
-
+        $status = array(0, 0, 0);
         $complete = 1;
-        for ($i = 1; $i <= 3; ++$i) {
-            if ($dbInfo['status' . $i] != 2) {
-                $complete = 0;
-            }
-            $status[$i] = $dbInfo['status' . $i];
-        }
-        if ($complete == 1 && myself()->_getV(TN_FIRST_TUPOP_STATUS, 0) == 0) {
-            myself()->_setV(TN_FIRST_TUPOP_STATUS, 0, 1);
-        }
+        $this->fillStatus($dbInfo, $status, $complete);
         myself()->_rspData(
             array(
                 'group' => $group,
@@ -109,4 +93,18 @@ class FirstTopupController extends BaseAuthedController {
         );
     }
 
+    private function fillStatus($dbInfo, &$status, &$complete)
+    {
+        $complete = 1;
+        for ($i = 1; $i <= 3; ++$i) {
+            if ($dbInfo['status' . $i] != 2) {
+                $complete = 0;
+            }
+            $status[$i - 1] = $dbInfo['status' . $i];
+        }
+        if ($complete == 1 && myself()->_getV(TN_FIRST_TUPOP_STATUS, 0) == 0) {
+            myself()->_setV(TN_FIRST_TUPOP_STATUS, 0, 1);
+        }
+    }
+
 }
diff --git a/webapp/models/FirstTopup.php b/webapp/models/FirstTopup.php
index 1b9f23b8..1a19d2d2 100644
--- a/webapp/models/FirstTopup.php
+++ b/webapp/models/FirstTopup.php
@@ -56,7 +56,7 @@ class FirstTopup extends BaseModel {
         $createDaySeconds = myself()->_getDaySeconds($dbInfo['createtime']);
         for ($i = 1; $i <= 3; ++$i) {
             if ($dbInfo['status' . $i] == 0) {
-                $dbInfo['status' . $i] = $nowDaySeconds > $createDaySeconds + 3600 * 24 * $i ? 1 : 0;
+                $dbInfo['status' . $i] = ($nowDaySeconds >= $createDaySeconds + 3600 * 24 * ($i - 1)) ? 1 : 0;
             }
         }
     }