From 9f0353244f1cc9bcca0b758afaa233acd8ba59e6 Mon Sep 17 00:00:00 2001
From: lkeme <1462364497@qq.com>
Date: Tue, 28 Apr 2020 13:20:11 +0800
Subject: [PATCH] [fix] GiftSend Closes #35

---
 CHANGELOG.md            | 12 ++++++++++++
 src/plugin/GiftSend.php | 17 ++++++++++++-----
 src/plugin/Match.php    |  2 --
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d45abb2..e85ee21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Release Notes
 # 本项目Log
 
+## v0.4.0.200428 alpha (2020-04-28)
+
+### Added
+- 
+
+### Changed
+-
+
+### Fixed
+- 修复赠送礼物逻辑
+-
+
 ## v0.4.0.200426 alpha (2020-04-26)
 
 ### Added
diff --git a/src/plugin/GiftSend.php b/src/plugin/GiftSend.php
index 5839dba..f9d09c5 100644
--- a/src/plugin/GiftSend.php
+++ b/src/plugin/GiftSend.php
@@ -186,14 +186,21 @@ class GiftSend
         }
         Log::info('勋章列表获取成功!');
         if (isset($data['data']['fansMedalList'])) {
+            $fans_medals = [];
             foreach ($data['data']['fansMedalList'] as $vo) {
                 if (!isset($vo['roomid'])) continue;
-                if (in_array($vo['roomid'], self::$room_list) && ($vo['day_limit'] - $vo['today_feed'])) {
+                $fans_medals[(string)$vo['roomid']] = $vo;
+            }
+            // 基于配置
+            foreach (self::$room_list as $room_id ){
+                // 配置是否存在获取
+                if (!array_key_exists((string)$room_id ,$fans_medals)){
+                    continue;
+                }
+                $vo = $fans_medals[(string)$room_id];
+                // 是否还需要投喂
+                if ($vo['day_limit'] - $vo['today_feed']){
                     self::$medal_list[(string)$vo['roomid']] = ($vo['day_limit'] - $vo['today_feed']);
-//                    $data = [
-//                        $vo['roomid'] => ($vo['day_limit'] - $vo['today_feed'])
-//                    ];
-//                    array_push(self::$medal_list, $data);
                 }
             }
         }
diff --git a/src/plugin/Match.php b/src/plugin/Match.php
index 2963786..125b71a 100644
--- a/src/plugin/Match.php
+++ b/src/plugin/Match.php
@@ -86,7 +86,6 @@ class Match
             }
             $status = self::getSignTask($room['type_id'], $room['room_id'], $room['short_room_id']);
             if ($status) {
-                echo "aaa" . PHP_EOL;
                 self::$room_infos[$title]['sign'] = true;
             } else {
                 self::$room_infos[$title]['sign'] = false;
@@ -99,7 +98,6 @@ class Match
             }
             $status = self::getShareTask($room['type_id'], $room['room_id'], $room['short_room_id']);
             if ($status) {
-                echo "aaa" . PHP_EOL;
                 self::$room_infos[$title]['share'] = true;
             } else {
                 self::$room_infos[$title]['share'] = false;