From 3f992484791558bb7d74a74ccc8142d9827c7055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Thu, 11 Dec 2025 20:40:32 +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 --- application/api/model/Decorate.php | 2 +- application/api/model/Tasks.php | 8 ++++---- application/api/model/UserGiftPack.php | 5 ++++- application/common/model/UserWallet.php | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 4861a5ce..ea20fbd3 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -17,7 +17,7 @@ class Decorate extends Model protected $updateTime = 'updatetime'; // 定义字段类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号 public $TypeArray = [1=>'头像框',12=>'降身卡',2=>'坐骑',9=>'聊天气泡',6=>'个人靓号',7=>'房间靓号',8=>'公会靓号',3=>'麦圈',10=>'CP特效',11=>'CP装扮']; - protected $FromType = [1=>'购买',2=>'后台赠送',3=>'礼盒开奖',4=>'好友赠送',5=>'首充赠送',6=>'天降好礼获得',7=>'财富等级特权赠送',8=>'新人充值好礼',9=>'爵位购买赠送']; + protected $FromType = [1=>'购买',2=>'后台赠送',3=>'礼盒开奖',4=>'好友赠送',5=>'首充赠送',6=>'天降好礼获得',7=>'财富等级特权赠送',8=>'新人充值好礼',9=>'爵位购买赠送',10=>'任务奖励']; public function __construct($data = []) { parent::__construct($data); diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php index a4835ec3..80375bd5 100644 --- a/application/api/model/Tasks.php +++ b/application/api/model/Tasks.php @@ -440,20 +440,20 @@ class Tasks extends Model foreach ($gift_bag_detail as $k=>$v){ switch ($v['type']) { case 1: //金币 方法1：直接添加到用户钱包 - $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::DROP_GIFT_REWARD,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::DROP_GIFT_REWARD)); + $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::DAILY_TASKS_REWARD,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::DROP_GIFT_REWARD)); break; case 2: //礼物 方法2：添加到用户礼物背包 - $res = model('UserGiftPack')->change_user_gift_pack($user_id,$v['foreign_id'],$v['quantity'],model('UserGiftPack')::DRAW_GIFT,"天降好礼获得礼物"); + $res = model('UserGiftPack')->change_user_gift_pack($user_id,$v['foreign_id'],$v['quantity'],model('UserGiftPack')::TASK_REWARD,"天降好礼获得礼物"); break; case 3: //坐骑 方法3：添加到用户装扮 $decorate_price_info = db::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find(); if(empty($decorate_price_info)){ break; } - $res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],6); + $res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],10); break; case 4: //道具 方法5：钻石 - $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::DROP_GIFT_REWARD,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::DROP_GIFT_REWARD)); + $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::DAILY_TASKS_REWARD,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::DROP_GIFT_REWARD)); default: break; } diff --git a/application/api/model/UserGiftPack.php b/application/api/model/UserGiftPack.php index 04ed0c31..e1e30e9c 100644 --- a/application/api/model/UserGiftPack.php +++ b/application/api/model/UserGiftPack.php @@ -38,6 +38,8 @@ class UserGiftPack extends Model const HOUR_RANK_GET = 9; //新人充值好礼 const NEW_CHARGE_GIFT = 10; + //任务奖励 + const TASK_REWARD = 11; public static function init() { @@ -57,7 +59,8 @@ class UserGiftPack extends Model self::DRAW_GIFT => '天降好礼获得', self::XLH_DRAW_GIFT_GET => '巡乐会抽奖所得', self::HOUR_RANK_GET => '小时榜获得', - self::NEW_CHARGE_GIFT => '新人充值好礼' + self::NEW_CHARGE_GIFT => '新人充值好礼', + self::TASK_REWARD => '任务奖励' ]; } diff --git a/application/common/model/UserWallet.php b/application/common/model/UserWallet.php index b29a9e7e..da24df49 100644 --- a/application/common/model/UserWallet.php +++ b/application/common/model/UserWallet.php @@ -151,7 +151,7 @@ class UserWallet extends Model self::OPERATION_RECHARGE => '会员充值', self::OPERATION_WITHDRAW => '会员提现', self::OPERATION_CONSUME => '金币转增（送出）', - self::DAILY_TASKS_REWARD => '每日任务奖励', + self::DAILY_TASKS_REWARD => '任务奖励', self::OPERATION_INVITE_REBATE => '邀请用户充值返利', self::OPERATION_DECORATION => '购买装扮', self::GIFT_BOX_REWARD => '礼盒奖励',