From 77c7e300f5804f11c2358239fbeb6eea2a581214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Fri, 9 Jan 2026 16:12:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/BarRoom.php | 2 +-
 application/api/model/Tasks.php   | 4 ++++
 extend/Yzh/YunPay.php             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php
index 7fd4ec4d..699ce32e 100644
--- a/application/api/model/BarRoom.php
+++ b/application/api/model/BarRoom.php
@@ -174,7 +174,7 @@ class BarRoom extends Model
         }
         //查询撩TA礼物
         $where = [];
-        $where['type'] = 4;
+        $where['type'] = 6;
         $where['label'] = 17;
         $where['is_show'] = 1;
         $where['is_can_buy'] = 1;
diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php
index 4620fcd0..6e2ee8c5 100644
--- a/application/api/model/Tasks.php
+++ b/application/api/model/Tasks.php
@@ -255,6 +255,10 @@ class Tasks extends Model
                     $v['task_status'] = 1;
                     $v['task_type_str'] = "未完成";
                 }
+                if($user_couple_task['day']<=date('Y-m-d') && $user_couple_task['status'] !=2){
+                    $v['task_status'] = 1;
+                    $v['task_type_str'] = "已过期";
+                }
             }elseif($v['task_id']==1){//每日签到处理
                 $sign_in_info = Db::name('vs_user_tasks_sign_in')->where(['user_id'=>$user_id,'sign_in_date'=>date('Y-m-d'),'delete_time'=>0])->find();
                 if ($sign_in_info) {
diff --git a/extend/Yzh/YunPay.php b/extend/Yzh/YunPay.php
index 98c9cac6..c76903e1 100644
--- a/extend/Yzh/YunPay.php
+++ b/extend/Yzh/YunPay.php
@@ -36,7 +36,7 @@ class YunPay
         $this->card_no = $card_no;
         $this->order_amount = $order_amount;
         $this->phone = $phone;
-        $this->dealer_platform_name = "秘地";
+        $this->dealer_platform_name = "羽声语音";
         //读取配置
         $this->config = Config::newFromArray(array(
             'app_dealer_id' => $this->sys_config->dealer_id,