From 8b7c48fe008bbe43dd5aa48bb77c88899c9ca45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Thu, 11 Dec 2025 19:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8A=9F=E8=83=BD=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4-=E8=81=94=E8=B0=83-=E4=BF=AE=E6=94=B9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/Activities.php        |  2 +-
 application/api/controller/Tasks.php          |  2 +-
 application/api/model/Tasks.php               | 38 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/application/adminapi/controller/Activities.php b/application/adminapi/controller/Activities.php
index 2f080ead..f8bd17a8 100644
--- a/application/adminapi/controller/Activities.php
+++ b/application/adminapi/controller/Activities.php
@@ -618,7 +618,7 @@ class Activities extends adminApi
             }else{
                 $lists[$key]['gift_id'] = "--";
                 $lists[$key]['gift_name'] = "--";
-                $lists[$key]['base_image'] = "--";
+                $lists[$key]['base_image'] = localpath_to_netpath("static/image/icon/gold.png");
                 $lists[$key]['quantity'] = $value['quantity'];
                 $lists[$key]['quantity_str'] = $value['quantity']."个";
                 $lists[$key]['gift_price'] = $value['gold']*$value['quantity'];
diff --git a/application/api/controller/Tasks.php b/application/api/controller/Tasks.php
index 496ea6e8..c1987c0e 100644
--- a/application/api/controller/Tasks.php
+++ b/application/api/controller/Tasks.php
@@ -76,7 +76,7 @@ class Tasks extends BaseCom
     //今日签到状态
     public function dailyTasksSignStatus(){
         $user_id = $this->uid;
-        $reslut = model('DailyTasks')->daily_tasks_sign_in_status($user_id);
+        $reslut = model('Tasks')->daily_tasks_sign_in_status($user_id);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php
index d0ed1341..a5cec83c 100644
--- a/application/api/model/Tasks.php
+++ b/application/api/model/Tasks.php
@@ -365,9 +365,9 @@ class Tasks extends Model
             }
         }else{
             if($task_info['task_type']==2){
-                $user_daily_tasks = Db::name('vs_user_daily_tasks')->where('user_id',$user_id)->where('task_id',$task_id)->whereTime('createtime', 'today')->find();
+                $user_daily_tasks = Db::name('vs_tasks_user_daily')->where('user_id',$user_id)->where('task_id',$task_id)->whereTime('createtime', 'today')->find();
             }else{
-                $user_daily_tasks = Db::name('vs_user_daily_tasks')->where('user_id',$user_id)->where('task_id',$task_id)->find();
+                $user_daily_tasks = Db::name('vs_tasks_user_daily')->where('user_id',$user_id)->where('task_id',$task_id)->find();
             }
             if (!$user_daily_tasks) {
                 return ['code' => 0, 'msg' => '请完成该任务','data' => null];
@@ -633,7 +633,41 @@ class Tasks extends Model
      */
     public function daily_tasks_sign_in_status($user_id){
         $sign_in_info = Db::name('vs_user_tasks_sign_in')->where(['user_id'=>$user_id,'sign_in_date'=>date('Y-m-d')])->find();
+        //礼包
+        $detail = DB::name('vs_gift_bag_detail')->where(['gift_bag_id'=>18])->select();
+        $list= [];
+        foreach ($detail as $k=>$v){
+            if($v['type'] == 1){
+                $list[$k]['gift_name'] = "金币";
+                $list[$k]['num'] = $v['gold'];
+                $list[$k]['gift_price'] = $v['gold'];
+                $list[$k]['type'] = 1;
+                $list[$k]['base_image'] = localpath_to_netpath("static/image/icon/gold.png");
+            }elseif($v['type'] == 2) {
+                $gift = DB::name('vs_gift')->where(['gid'=>$v['foreign_id']])->find();
+                $list[$k]['gift_name'] = $gift['gift_name'];
+                $list[$k]['num']  = $v['quantity']." 个";
+                $list[$k]['gift_price'] = $gift['gift_price'];
+                $list[$k]['type'] =2;
+                $list[$k]['base_image'] = $gift['base_image'];
+            } elseif($v['type'] == 3) {
+                $decorate_price = DB::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find();
+                $gift = DB::name('vs_decorate')->where(['did'=>$decorate_price['did']])->find();
+                $list[$k]['gift_name'] = $gift['title'];  //装扮名称
+                $list[$k]['num']  = $decorate_price['day']." 天"??0; //天数
+                $list[$k]['gift_price'] = $decorate_price['price']; //价格
+                $list[$k]['type'] =3;
+                $list[$k]['base_image'] = $gift['base_image'];
+            }elseif($v['type'] == 4) {
+                $list[$k]['gift_name'] = "钻石";
+                $list[$k]['num'] = $v['quantity'];
+                $list[$k]['gift_price'] = $v['gold'];
+                $list[$k]['type'] = 4;
+                $list[$k]['base_image'] = localpath_to_netpath("static/image/icon/gold.png");
+            }
+        }
         $result = [];
+        $result['gift_bag'] = $list;
         if ($sign_in_info) {
             $result['status'] = 1;
             $result['status_str'] = "已签到";