From a83efc37f4b30da4a91a091ceb482ebdce1fb022 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 2 Aug 2023 19:38:31 +0800
Subject: [PATCH] 1

---
 doc/FirstTopup.py                             | 15 ++----------
 .../controller/FirstTopupController.class.php | 23 +++++++++++++------
 webapp/models/FirstTopup.php                  |  8 ++++++-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/doc/FirstTopup.py b/doc/FirstTopup.py
index 0254c667..da89e878 100644
--- a/doc/FirstTopup.py
+++ b/doc/FirstTopup.py
@@ -21,18 +21,6 @@ class FirstTopup(object):
                     ['!status', [0], '领取状态 0-未领取 1-可领取 2-已领取'],
                 ]
             },
-            {
-                'name': 'begin',
-                'desc': '开始首充',
-                'group': 'FirstTopup',
-                'url': 'webapp/index.php?c=FirstTopup&a=begin',
-                'params': [
-                    _common.ReqHead(),
-                ],
-                'response': [
-                    _common.RspHead(),
-                ]
-            },
             {
                 'name': 'get',
                 'desc': '获取首充奖励',
@@ -46,7 +34,8 @@ class FirstTopup(object):
                     _common.RspHead(),
                     ['group', 0, '奖励组id'],
                     ['!status', [0], '领取状态 0-未领取 1-可领取 2-已领取'],
-                    ['!reward', [_common.Reward()], '奖励信息'],
+                    ['award', _common.Award(), '奖励信息'],
+                    ['property_chg', _common.PropertyChg(), '属性变更'],
                 ]
             },
         ]
diff --git a/webapp/controller/FirstTopupController.class.php b/webapp/controller/FirstTopupController.class.php
index eb26db80..99f355c1 100644
--- a/webapp/controller/FirstTopupController.class.php
+++ b/webapp/controller/FirstTopupController.class.php
@@ -4,12 +4,16 @@ require_once('mt/FirstTopup.php');
 
 require_once("models/FirstTopup.php");
 
+require_once('services/AwardService.php');
 require_once('services/PropertyChgService.php');
 
 use phpcommon\SqlHelper;
 
 use models\FirstTopup;
 
+use services\AwardService;
+use services\PropertyChgService;
+
 class FirstTopupController extends BaseAuthedController {
 
     public function info()
@@ -72,15 +76,19 @@ class FirstTopupController extends BaseAuthedController {
         ));
         $dbInfo['status' . $group] = 2;
         // 发放奖励
-        $reward = mt\FirstTopup::getByGroup($group);
+        $awardService = new services\AwardService();
         $propertyChgService = new services\PropertyChgService();
+        $reward = mt\FirstTopup::getByGroup($group);
+        $awardItems = array();
         for ($i = 0; $i < count($reward); $i++) {
-            $item = $reward[$i];
-            $itemMeta = mt\Item::get($item['goods_id']);
-            for ($j = 0; $j < $item['goods_num']; $j++) {
-                $this->internalAddItem($propertyChgService, $itemMeta, 1);
-            }
+            array_push($awardItems,
+                       array(
+                           $item['goods_id'],
+                           $item['goods_num']
+                       ));
         }
+        myself()->_addItems($awardItems, $awardService, $propertyChgService);
+
         $complete = 1;
         for ($i = 1; $i <= 3; ++$i) {
             if ($dbInfo['status' . $i] != 2) {
@@ -95,7 +103,8 @@ class FirstTopupController extends BaseAuthedController {
             array(
                 'group' => $group,
                 'status' => $status,
-                'reward' => $reward,
+                'award' => $awardService->toDto(),
+                'property_chg' => $propertyChgService->toDto(),
             )
         );
     }
diff --git a/webapp/models/FirstTopup.php b/webapp/models/FirstTopup.php
index 43615ee3..1b9f23b8 100644
--- a/webapp/models/FirstTopup.php
+++ b/webapp/models/FirstTopup.php
@@ -52,7 +52,13 @@ class FirstTopup extends BaseModel {
 
     public static function adjustStatus(&$dbInfo)
     {
-
+        $nowDaySeconds = myself()->_getNowDaySeconds();
+        $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;
+            }
+        }
     }
 
 }