完善积分信息所需要的服务接口

app/Http/Controllers/IntegralsController.php

@@ -10,22 +10,32 @@ use Illuminate\Support\Facades\DB;
 
 class IntegralsController extends Controller
 {
-    public function index()
+    public function show($id)
+    {
+        $integral = Integral::find($id)->toArray();
+
+        return $this->Export(0, 'ok', ['data' => $integral]);
+    }
+
+    public function index(Request $request)
     {
         $integrals = Integral::with('integralType:id,name')
-            ->whereStatus(1)
+            ->page($request->page, $request->page_size)
+            ->orderBy('id','desc')
             ->get()->toArray();
+        $count = Integral::count();
 
-        return $this->Export(0, 'ok', ['data' => $integrals]);
+        return $this->Export(0, 'ok', ['data' => $integrals, 'count' => $count]);
     }
 
     public function create(Request $request)
     {
         $res = DB::table('integrals')->insert([
             'name'            => $request->name,
-            'integral_type_id' => $request->integral_type_id,
+            'daily_limit'     => $request->daily_limit,
+            'integral_amount' => $request->integral_amount,
             'add_time'        => time(),
-            'status'           => 1,
+            'status'          => $request->status,
         ]);
 
         if ($res) {
@@ -40,7 +50,9 @@ class IntegralsController extends Controller
         $res = DB::table('integrals')->where('id', $id)
             ->update([
                 'name'            => $request->name,
-                'integral_type_id' => $request->integral_type_id,
+                'daily_limit'     => $request->daily_limit,
+                'integral_amount' => $request->integral_amount,
+                'update_time'     => time(),
             ]);
         if ($res) {
             return $this->Export(0, 'ok');

app/Http/Filters/IntegralFilter.php

+<?php
+
+
+namespace App\Http\Filters;
+
+
+class IntegralFilter extends QueryFilter
+{
+
+}
\ No newline at end of file

app/Http/Filters/QueryFilter.php

+<?php
+
+
+namespace App\Http\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+
+abstract class QueryFilter
+{
+
+    protected $request;
+    protected $builder;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function apply(Builder $builder)
+    {
+        $this->builder = $builder;
+
+        foreach ($this->filters() as $name => $value) {
+            if (method_exists($this, $name)) {
+                call_user_func_array([$this, $name], array_filter([$value]));
+            }
+        }
+
+        return $this->builder;
+    }
+
+    public function filters()
+    {
+        return $this->request->all();
+    }
+}
\ No newline at end of file

app/Models/Integral.php

@@ -10,7 +10,12 @@ class Integral extends Model
 {
     public $timestamps = false;
 
-    protected $hidden = ['id'];
+    protected $hidden = [];
+
+    public function scopePage($query, $page = 1, $pageSize = 10)
+    {
+        return $query->offset(($page - 1) * $pageSize)->limit($pageSize);
+    }
 
     public function integralType()
     {

routes/web.php

@@ -21,6 +21,7 @@ $router->get('/key', function () {
 
 //积分信息
 $router->get('/integrals', 'IntegralsController@index');
+$router->get('/integrals/{id}', 'IntegralsController@show');
 $router->post('/integrals', 'IntegralsController@create');
 $router->patch('/integrals/{id}', 'IntegralsController@update');
 $router->delete('/integrals/{id}', 'IntegralsController@destroy');

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":false,"jobs":[],"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_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 63095 22","LANGUAGE":"en_US:","SHLVL":"1","HOME":"/home/vagrant","OLDPWD":"/home/vagrant","SSH_TTY":"/dev/pts/1","LOGNAME":"vagrant","_":"/usr/bin/php","XDG_SESSION_ID":"11","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 63095 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":1565667347.801414,"REQUEST_TIME":1565667347,"argv":["/home/vagrant/code/ic_server_welfare/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"UTC","DB_CONNECTION":"mysql","DB_HOST":"127.0.0.1","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"homestead","DB_PASSWORD":"secret","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"UTC","DB_CONNECTION":"mysql","DB_HOST":"127.0.0.1","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"homestead","DB_PASSWORD":"secret","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","SYSTEM_CODE":"09","SYSTEM_NAME":"IC业务助手福利中心服务","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"61009","SHELL_VERBOSITY":0}}}
\ No newline at end of file
+{"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":false,"jobs":[],"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_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 51943 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 51943 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":1565850133.904787,"REQUEST_TIME":1565850133,"argv":["/home/vagrant/code/ic_server_welfare/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"UTC","DB_CONNECTION":"mysql","DB_HOST":"127.0.0.1","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"homestead","DB_PASSWORD":"secret","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","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"0uUBt7t4fFIttyqkyLxDhLC7gn9361Yt","APP_TIMEZONE":"UTC","DB_CONNECTION":"mysql","DB_HOST":"127.0.0.1","DB_PORT":"3306","DB_DATABASE":"ic_welfare","DB_USERNAME":"homestead","DB_PASSWORD":"secret","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","SHELL_VERBOSITY":0}}}
\ No newline at end of file

storage/laravels.pid

-3671
\ No newline at end of file
+18189
\ No newline at end of file