From d8e954493e60d0d4df32d26ff3f264a12c5f91d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 19 Sep 2025 18:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E7=89=A9=E5=A2=99=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E7=9B=B2=E7=9B=92=E7=A4=BC=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/User.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/api/model/User.php b/application/api/model/User.php
index 814247d..15dd83e 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -339,10 +339,11 @@ class User extends Model
     public function get_user_gift_wall_info($uid)
     {
         //查询用户礼物墙 以gift_id,send_user_id分组  同一用户送的同一礼物相加
-        $result = db::name('vs_give_gift')
-            ->where(['gift_user' => $uid])
-            ->field('gift_id,user_id,sum(number) as total')
-            ->group('gift_id,user_id')
+        $result = db::name('vs_give_gift')->alias('a')
+            ->join('vs_gift g', 'a.gift_id = g.gid')
+            ->where(['a.gift_user' => $uid,'g.label'=>['<>',2]])
+            ->field('a.gift_id,a.user_id,sum(a.number) as total')
+            ->group('a.gift_id,a.user_id')
             ->order('total desc')
             ->select();
 //        var_dump($result);exit;
@@ -391,7 +392,7 @@ class User extends Model
         }
         $data = array_values($data);
         //查询所有的礼物
-        $gift_list = db::name('vs_gift')->field('gid as gift_id,gift_name,base_image,gift_price')->where(['delete_time' => 0,'is_show' => 1])->select();
+        $gift_list = db::name('vs_gift')->field('gid as gift_id,gift_name,base_image,gift_price')->where(['delete_time' => 0,'is_show' => 1,'label'=>['<>',2]])->select();
         //对比去除$data 里面的礼物
         $gift_list = array_filter((array)$gift_list, function ($item) use ($data) {
             return !in_array($item['gift_id'], array_column($data, 'gift_id'));