From 9f220c8bba9c491967195bab37bae468868a5314 Mon Sep 17 00:00:00 2001
From: liwei <Lw_720@163.com>
Date: Wed, 18 Oct 2023 09:55:29 +0800
Subject: [PATCH 1/2] 1

---
 app/Controller/Api/V1/Group/GiftController.php | 3 +++
 app/Service/GiftService.php                    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/Controller/Api/V1/Group/GiftController.php b/app/Controller/Api/V1/Group/GiftController.php
index 7bf086a..71d87e7 100644
--- a/app/Controller/Api/V1/Group/GiftController.php
+++ b/app/Controller/Api/V1/Group/GiftController.php
@@ -219,6 +219,7 @@ class GiftController extends CController
                     }
                     $j['follow_status'] = $follow_status;
                     $j['is_fans'] = $is_fans;
+                    $j['mine_id'] = data_get($model, 'mine_id','');
                     $return[] = $j;
                 }
             } else {
@@ -266,6 +267,8 @@ class GiftController extends CController
                         }
                         $j['follow_status'] = $follow_status;
                         $j['is_fans'] = $is_fans;
+                        $j['mine_id'] = data_get($model, 'mine_id','');
+
                         $return[] = $j;
                     }
                 }
diff --git a/app/Service/GiftService.php b/app/Service/GiftService.php
index 24c86c9..174c529 100644
--- a/app/Service/GiftService.php
+++ b/app/Service/GiftService.php
@@ -136,6 +136,7 @@ class GiftService extends BaseService
                 if (!empty($idnum)) {
                     if (!isset($idnums[$idnum])) {
                         $idnums[$idnum]['points'] = 0;
+                        $idnums[$idnum]['mine_id'] = data_get($v, 'mine_id', 0);
                         $idnums[$idnum]['player_id'] = $playerId;
                         $idnums[$idnum]['head_img'] = $headImg;
                         $idnums[$idnum]['follow_status'] = $follow_status;
@@ -145,6 +146,7 @@ class GiftService extends BaseService
                     $idnums[$idnum]['points'] += $points;
                 } else {
                     $idnums[$k]['points'] = empty($points)? 0: $points;
+                    $idnums[$k]['mine_id'] = data_get($v, 'mine_id', 0);
                     $idnums[$k]['player_id'] = $playerId;
                     $idnums[$k]['head_img'] = $headImg;
                     $idnums[$k]['is_fans'] = $is_fans;
-- 
Gitee


From ecf694a71a7c78bbc5f55e3c0ef8495ec52dcb3f Mon Sep 17 00:00:00 2001
From: liwei <Lw_720@163.com>
Date: Wed, 18 Oct 2023 09:58:38 +0800
Subject: [PATCH 2/2] 1

---
 app/Service/GiftService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Service/GiftService.php b/app/Service/GiftService.php
index 174c529..8b43caf 100644
--- a/app/Service/GiftService.php
+++ b/app/Service/GiftService.php
@@ -136,7 +136,7 @@ class GiftService extends BaseService
                 if (!empty($idnum)) {
                     if (!isset($idnums[$idnum])) {
                         $idnums[$idnum]['points'] = 0;
-                        $idnums[$idnum]['mine_id'] = data_get($v, 'mine_id', 0);
+                        $idnums[$idnum]['mine_id'] = data_get($v, 'mine_id', '');
                         $idnums[$idnum]['player_id'] = $playerId;
                         $idnums[$idnum]['head_img'] = $headImg;
                         $idnums[$idnum]['follow_status'] = $follow_status;
@@ -146,7 +146,7 @@ class GiftService extends BaseService
                     $idnums[$idnum]['points'] += $points;
                 } else {
                     $idnums[$k]['points'] = empty($points)? 0: $points;
-                    $idnums[$k]['mine_id'] = data_get($v, 'mine_id', 0);
+                    $idnums[$k]['mine_id'] = data_get($v, 'mine_id', '');
                     $idnums[$k]['player_id'] = $playerId;
                     $idnums[$k]['head_img'] = $headImg;
                     $idnums[$k]['is_fans'] = $is_fans;
-- 
Gitee