diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php index 5daa35aa..ed86dd91 100644 --- a/application/adminapi/controller/Decorate.php +++ b/application/adminapi/controller/Decorate.php @@ -97,6 +97,11 @@ class Decorate extends adminApi if($type==""){ return V(0,"参数错"); } + if(in_array($type, [6,7,8])){ + if($special_num==""){ + return V(0,"请填写靓号"); + } + } $data = [ 'title' => $title, @@ -152,6 +157,11 @@ class Decorate extends adminApi $special_num = input('special_num', ''); $ext_value = input('ext_value', ''); $price = input('price', ''); + if(in_array($type, [6,7,8])){ + if($special_num==""){ + return V(0,"请填写靓号"); + } + } $data = []; if($title!=""){ $data['title'] = $title; diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php index 6e2ee8c5..09655926 100644 --- a/application/api/model/Tasks.php +++ b/application/api/model/Tasks.php @@ -255,7 +255,7 @@ 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){ + if($user_couple_task['day']where(['deal_type'=>2,'status'=>['in',[4,5]]])->where(['submit_yun_time'=>['>=',$time]])->select(); + $withdrawal = db::name('vs_user_withdrawal')->where(['deal_type'=>2,'status'=>['in',[4,5]],'refund_time'=>0])->where(['submit_yun_time'=>['>=',$time]])->select(); echo "提现云账号订单状态查询条数(".count($withdrawal)."):\n"; foreach ($withdrawal as $key => $value) { if($value['status'] == 5){ @@ -172,7 +172,7 @@ class PerformPerSecond continue; } } - db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([ + $up_result = db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([ 'status' => 6, 'pay_time' => time(), 'pay_message' => $result['data']['msg'], @@ -181,6 +181,12 @@ class PerformPerSecond // 'personal_tax_rate' => $result['personal_tax_rate'] ?? 0, 'received_tax_amount' => $result['data']['received_tax_amount'] ?? 0, ]); + if($up_result){ + //扣除冻结金额 + $diamond_to_rmb_ratio = get_system_config_value('diamond_to_rmb_ratio'); + $money = $value['money'] * $diamond_to_rmb_ratio; //提现金额转换 人民币转为钻石 + $result = db::name('user_wallet')->where('user_id', $value['user_id'])->setDec('frozen_earnings', $money); + } }else{ db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([ 'status' => 5,