巡乐会bug修改

application/api/model/BlindBoxTurntableGiftDrawWorldNew.php

@@ -869,13 +869,17 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     /**
      * 统计礼物数量
      */
-    private function countGifts($precomputedResults)
+    private function countGifts($precomputedResults,$key_type = 1)
     {
         $giftCounts = [];
         foreach ($precomputedResults as $result) {
             $giftId = $result['gift_bag_detail']['foreign_id'];
             $gift_user_id = $result['gift_user_id'];
-            $key = $giftId.'_'.$gift_user_id;
+            if($key_type ==1){
+                $key = $giftId;
+            }else{
+                $key = $giftId.'_'.$gift_user_id;
+            }
             if (!isset($giftCounts[$key])) {
                 $giftCounts[$key] = [
                     'gift_user_id' => $result['gift_user_id'],
@@ -913,7 +917,7 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     private function batchInsertBlindBoxResults($precomputedResults, $boxTurntableLog)
     {
         // 统计每个用户每个礼物的数量
-        $giftUserCounts = $this->countGifts($precomputedResults);
+        $giftUserCounts = $this->countGifts($precomputedResults,2);
         // 批量插入
         $batchInsertData = [];
         foreach ($giftUserCounts as $userGift) {

application/api/model/Guild.php

@@ -1023,7 +1023,8 @@ class Guild extends Model
             'is_deacon'  => $is_deacon,
             'user_list'  => $user_list['data']['list'],
             'name'      => $group_member_info['data'][0]['Name'],
-            'notification'     => $group_member_info['data'][0]['Notification']
+            'notification'     => $group_member_info['data'][0]['Notification'],
+            'mute_all_member'     => $group_member_info['data'][0]['MuteAllMember']
         ];
         return ['code' => 1, 'msg' => '获取成功', 'data' => $return_data];