Skip to content

杨树贤 / ic_server_welfare

Go to a project
Commit 75315a6a by 杨树贤
Options

修改增加保单只返回成功或者失败,不返回超过限制的提示

parent d420842b
Inline Side-by-side
Showing with 38 additions and 25 deletions
app/Http/Controllers/IntegralBillsController.php
...@@ -5,6 +5,7 @@ namespace App\Http\Controllers; ...@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Http\Filters\IntegralBillFilter; use App\Http\Filters\IntegralBillFilter;
use App\Http\Filters\IntegralFilter; use App\Http\Filters\IntegralFilter;
use App\Models\Integral;
use App\Models\IntegralBill; use App\Models\IntegralBill;
use Illuminate\Http\Request; use Illuminate\Http\Request;
...@@ -36,23 +37,31 @@ class IntegralBillsController extends Controller ...@@ -36,23 +37,31 @@ class IntegralBillsController extends Controller
* 创建红包获取记录 * 创建红包获取记录
* @param Request $request * @param Request $request
* @param IntegralBill $integralBill * @param IntegralBill $integralBill
* @param Integral $integral
* @return array * @return array
*/ */
public function store(Request $request, IntegralBill $integralBill) public function store(Request $request, IntegralBill $integralBill, Integral $integral)
{ {
$data = [ $data = [
'user_id' => $request->user_id, 'user_id' => $request->get('user_id'),
'integral_id' => $request->integral_id, 'integral_id' => $request->get('integral_id'),
'status' => 1,
'add_time' => time(), 'add_time' => time(),
]; ];
$res = $integralBill->createIntegralBill($data);
if ($res) { //先去检测这个操作是否已经达到每个用户每日的限额
return $this->Export(0, 'ok'); $canAdd = $integral->checkIntegralLimit($data['user_id'], $data['integral_id']);
} else { if ($canAdd) {
return $this->Export(ErrorCode(6, 5), '新增红包获取记录失败'); $res = $integralBill->createIntegralBill($data);
if ($res) {
return $this->Export(0, 'ok');
} else {
return $this->Export(ErrorCode(6, 5), '新增红包获取记录失败');
}
} }
// else {
// return $this->Export(ErrorCode(1, 1), '该操作超过限定次数');
// }
return $this->Export(0, 'ok');
} }
/** /**
......
app/Models/IntegralBill.php
...@@ -11,6 +11,7 @@ use Hhxsv5\LaravelS\Swoole\Task\Task; ...@@ -11,6 +11,7 @@ use Hhxsv5\LaravelS\Swoole\Task\Task;
use http\Env\Request; use http\Env\Request;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class IntegralBill extends Model class IntegralBill extends Model
{ {
...@@ -44,20 +45,23 @@ class IntegralBill extends Model ...@@ -44,20 +45,23 @@ class IntegralBill extends Model
return ['data' => $bills, 'count' => $count]; return ['data' => $bills, 'count' => $count];
} }
//这是一个比较重要的方法,这个方法关系着需不需要插入红包获取流水
public function createIntegralBill($data = []) public function createIntegralBill($data = [])
{ {
$res = DB::table('integral_bills')->insert($data); $integralId = $data['integral_id'];
switch ($integralId) {
return $res; case Integral::INTEGRAL_TYPE_UPLOAD_GOODS:
case Integral::INTEGRAL_TYPE_INTEGRAL_CODE:
// public function addIntegralBill($userId,$integralId) case Integral::INTEGRAL_TYPE_SHARE:
// { case Integral::INTEGRAL_TYPE_OFFER:
// $task = new IntegralBillTask($data); case Integral::INTEGRAL_TYPE_CHECK_IN:
// $result = Task::deliver($task); case Integral::INTEGRAL_TYPE_INVITE_FRIEND:
// if (!$result) { $task = new IntegralBillTask($data);
// return false; $result = Task::deliver($task);
// }
// } return $result ? true : false;
break;
}
} }
//更新用户红包兑换列表 //更新用户红包兑换列表
......
storage/laravels.json
{"server":{"listen_ip":"0.0.0.0","listen_port":"61009","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/home/vagrant/code/ic_server_welfare","inotify_reload":{"enable":false,"watch_path":"/home/vagrant/code/ic_server_welfare","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":true,"jobs":["Hhxsv5\\LaravelS\\Illuminate\\LaravelScheduleJob"],"max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"destroy_controllers":{"enable":false,"excluded_list":[]},"swoole":{"daemonize":true,"dispatch_mode":2,"reactor_num":2,"worker_num":2,"task_worker_num":2,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/home/vagrant/code/ic_server_welfare/storage/laravels.pid","log_file":"/home/vagrant/code/ic_server_welfare/storage/logs/swoole-2019-08.log","log_level":4,"document_root":"/home/vagrant/code/ic_server_welfare/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/home/vagrant/code/ic_server_welfare","ignore_check_pid":false},"laravel":{"root_path":"/home/vagrant/code/ic_server_welfare","static_path":"/home/vagrant/code/ic_server_welfare/public","cleaners":[],"register_providers":[],"destroy_controllers":{"enable":false,"excluded_list":[]},"is_lumen":true,"_SERVER":{"LESSOPEN":"| /usr/bin/lesspipe %s","MAIL":"/var/mail/vagrant","USER":"vagrant","SSH_CLIENT":"10.0.2.2 50169 22","LANGUAGE":"en_US:","SHLVL":"1","HOME":"/home/vagrant","OLDPWD":"/home/vagrant","SSH_TTY":"/dev/pts/0","LOGNAME":"vagrant","_":"/usr/bin/php","XDG_SESSION_ID":"5","TERM":"cygwin","RBENV_SHELL":"bash","PATH":"/home/vagrant/.composer/vendor/bin:/usr/local/go/bin:/home/vagrant/.rbenv/plugins/ruby-build/bin:/home/vagrant/.rbenv/shims:/home/vagrant/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/vagrant/.dotnet/tools","S_COLORS":"auto","XDG_RUNTIME_DIR":"/run/user/1000","LANG":"en_US.UTF-8","LS_COLORS":"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:","SHELL":"/bin/bash","LESSCLOSE":"/usr/bin/lesspipe %s %s","LC_ALL":"en_US.UTF-8","PWD":"/home/vagrant/code/ic_server_welfare","SSH_CONNECTION":"10.0.2.2 50169 10.0.2.15 22","XDG_DATA_DIRS":"/usr/local/share:/usr/share:/var/lib/snapd/desktop","PHP_SELF":"/home/vagrant/code/ic_server_welfare/artisan","SCRIPT_NAME":"/home/vagrant/code/ic_server_welfare/artisan","SCRIPT_FILENAME":"/home/vagrant/code/ic_server_welfare/artisan","PATH_TRANSLATED":"/home/vagrant/code/ic_server_welfare/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1566807294.205077,"REQUEST_TIME":1566807294,"argv":["/home/vagrant/code/ic_server_welfare/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"PRC","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"ic_welfare","DB_PASSWORD":"ic_welfare#zsyM","DB_PREFIX":"ic_","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.235","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"PRC","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"ic_welfare","DB_PASSWORD":"ic_welfare#zsyM","DB_PREFIX":"ic_","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.235","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","SHELL_VERBOSITY":0}}} {"server":{"listen_ip":"0.0.0.0","listen_port":"61009","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/home/vagrant/code/ic_server_welfare","inotify_reload":{"enable":false,"watch_path":"/home/vagrant/code/ic_server_welfare","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":true,"jobs":["Hhxsv5\\LaravelS\\Illuminate\\LaravelScheduleJob"],"max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"destroy_controllers":{"enable":false,"excluded_list":[]},"swoole":{"daemonize":true,"dispatch_mode":2,"reactor_num":2,"worker_num":2,"task_worker_num":2,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/home/vagrant/code/ic_server_welfare/storage/laravels.pid","log_file":"/home/vagrant/code/ic_server_welfare/storage/logs/swoole-2019-08.log","log_level":4,"document_root":"/home/vagrant/code/ic_server_welfare/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/home/vagrant/code/ic_server_welfare","ignore_check_pid":false},"laravel":{"root_path":"/home/vagrant/code/ic_server_welfare","static_path":"/home/vagrant/code/ic_server_welfare/public","cleaners":[],"register_providers":[],"destroy_controllers":{"enable":false,"excluded_list":[]},"is_lumen":true,"_SERVER":{"LESSOPEN":"| /usr/bin/lesspipe %s","MAIL":"/var/mail/vagrant","USER":"vagrant","SSH_CLIENT":"10.0.2.2 51475 22","LANGUAGE":"en_US:","SHLVL":"1","HOME":"/home/vagrant","OLDPWD":"/home/vagrant","SSH_TTY":"/dev/pts/0","LOGNAME":"vagrant","_":"/usr/bin/php","XDG_SESSION_ID":"9","TERM":"cygwin","RBENV_SHELL":"bash","PATH":"/home/vagrant/.composer/vendor/bin:/usr/local/go/bin:/home/vagrant/.rbenv/plugins/ruby-build/bin:/home/vagrant/.rbenv/shims:/home/vagrant/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/vagrant/.dotnet/tools","S_COLORS":"auto","XDG_RUNTIME_DIR":"/run/user/1000","LANG":"en_US.UTF-8","LS_COLORS":"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:","SHELL":"/bin/bash","LESSCLOSE":"/usr/bin/lesspipe %s %s","LC_ALL":"en_US.UTF-8","PWD":"/home/vagrant/code/ic_server_welfare","SSH_CONNECTION":"10.0.2.2 51475 10.0.2.15 22","XDG_DATA_DIRS":"/usr/local/share:/usr/share:/var/lib/snapd/desktop","PHP_SELF":"/home/vagrant/code/ic_server_welfare/artisan","SCRIPT_NAME":"/home/vagrant/code/ic_server_welfare/artisan","SCRIPT_FILENAME":"/home/vagrant/code/ic_server_welfare/artisan","PATH_TRANSLATED":"/home/vagrant/code/ic_server_welfare/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1566820556.319048,"REQUEST_TIME":1566820556,"argv":["/home/vagrant/code/ic_server_welfare/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"PRC","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"ic_welfare","DB_PASSWORD":"ic_welfare#zsyM","DB_PREFIX":"ic_","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.235","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"PRC","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"ic_welfare","DB_PASSWORD":"ic_welfare#zsyM","DB_PREFIX":"ic_","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.235","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","SHELL_VERBOSITY":0}}}
\ No newline at end of file \ No newline at end of file
storage/laravels.pid
4820 3271
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment