diff --git a/application/api/model/DailyTasks.php b/application/api/model/DailyTasks.php index 31b603d..14a3965 100644 --- a/application/api/model/DailyTasks.php +++ b/application/api/model/DailyTasks.php @@ -144,7 +144,7 @@ class DailyTasks extends Model if($v['task_id'] == 17){ if($user_sign_task['status'] == 0){ $v['task_status'] = 2; - $v['task_type_str'] = "领取金币"; + $v['task_type_str'] = "领取钻石"; }else{ $v['task_status'] = 3; $v['task_type_str'] = "已领取"; @@ -294,7 +294,7 @@ class DailyTasks extends Model $res = model('common/UserWallet')->change_user_money($user_id, $user_sign_task['value'], model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::SIGN_MASTER_DAILY_RETURN,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::SIGN_MASTER_DAILY_RETURN)." 第".$user_sign_task['times']."天"); if ($res['code'] != 1) { Db::rollback(); - return ['code' => 0, 'msg' => $reslut['msg'], 'data' => null]; + return ['code' => 0, 'msg' => $res['msg'], 'data' => null]; } } else { Db::rollback(); @@ -311,7 +311,7 @@ class DailyTasks extends Model $res = model('common/UserWallet')->change_user_money($user_id, $user_daily_tasks['gold_reward'], model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::DAILY_TASKS_REWARD,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::DAILY_TASKS_REWARD)."( ".$task_info['task_name'].")"); if ($res['code'] != 1) { Db::rollback(); - return ['code' => 0, 'msg' => $reslut['msg'], 'data' => null]; + return ['code' => 0, 'msg' => $res['msg'], 'data' => null]; } } else { Db::rollback(); diff --git a/application/common/model/UserWallet.php b/application/common/model/UserWallet.php index 160d7f0..fe313fe 100644 --- a/application/common/model/UserWallet.php +++ b/application/common/model/UserWallet.php @@ -177,7 +177,8 @@ class UserWallet extends Model self::NOBILITY_PURCHASE_COIN => '爵位购买赠送(金币)', self::SIGN => '签约支出', self::SIGN_FAILURE => '签约失败退回', - self::FIRST_SIGN_INCOME => '首次被签约收入' + self::FIRST_SIGN_INCOME => '首次被签约收入', + self::SIGN_MASTER_DAILY_RETURN => '签约师傅每日返还' ]; if($type){ return $status[$type] ?? '';