Merge branch 'durong' into develop

app/Repositories/Behavior/BehaviorRepository.php

@@ -4,7 +4,6 @@ use App\Models\Behavior;
 use App\Models\BehaviorOperationLog;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Tymon\JWTAuth\Facades\JWTAuth;
@@ -342,36 +341,38 @@ class BehaviorRepository
         if(isset($request['is_open'])){
             $where[] = ['is_open',$request['is_open']];
         }
+        //行为级别唯一/多级筛选
         if(isset($request['behavior_level'])){
             $where[] = ['behavior_level',$request['behavior_level']];
         }
         if(isset($request['name'])){
             $where[] = ['name', 'like', "%{$request['name']}%"];
         }
+        //触发次数由多到少-由少到多筛选
         if (isset($request['trigger_times']) && $request['trigger_times'] == 0){
             return $this->behavior->orderBy('trigger_times','desc')->paginate($perPage);
         }elseif (isset($request['trigger_times']) && $request['trigger_times'] == 1){
             return $this->behavior->orderBy('trigger_times','asc')->paginate($perPage);
         }
-
+        //有效触发由多到少-由少到多筛选
         if (isset($request['effective_trigger']) && $request['effective_trigger'] == 0){
             return $this->behavior->orderBy('effective_trigger','desc')->paginate($perPage);
         }elseif (isset($request['effective_trigger']) && $request['effective_trigger'] == 1){
             return $this->behavior->orderBy('effective_trigger','asc')->paginate($perPage);
         }
-
+        //绝对级数由多到少-由少到多筛选
         if (isset($request['absolute_progression']) && $request['absolute_progression'] == 0){
             return $this->behavior->orderBy('absolute_progression','desc')->paginate($perPage);
         }elseif (isset($request['absolute_progression']) && $request['absolute_progression'] == 1){
             return $this->behavior->orderBy('absolute_progression','asc')->paginate($perPage);
         }
-
+        //耗费体力值由多到少-由少到多筛选
         if (isset($request['physical_strength']) && $request['physical_strength'] == 0){
             return $this->behavior->orderBy('physical_strength','desc')->paginate($perPage);
         }elseif (isset($request['physical_strength']) && $request['physical_strength'] == 1){
             return $this->behavior->orderBy('physical_strength','asc')->paginate($perPage);
         }
-
+        //发放彩虹豆由多到少-由少到多筛选
         if (isset($request['grant_rainbow_beans']) && $request['grant_rainbow_beans'] == 0){
             return $this->behavior->orderBy('grant_rainbow_beans','desc')->paginate($perPage);
         }elseif (isset($request['grant_rainbow_beans']) && $request['grant_rainbow_beans'] == 1){