YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
刘华清
2025-12-11 19:46:55 +08:00
parent a61753d3c7 7b33568abd
commit d42c37bd0e
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/adminapi/controller/Activities.php
View File

@@ -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'];

2
application/api/controller/Tasks.php
View File

@@ -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']);
}

38
application/api/model/Tasks.php
View File

@@ -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'] = "已签到";