Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/Behavior/BehaviorController.php

@@ -128,24 +128,7 @@ class BehaviorController extends Controller
     public function behaviorData(Request $request)
     {
         $behavior_list = $this->behaviorRepository->dataList($request->all());
-        if (count($behavior_list)>0){
-            //已开启行为
-            $is_open = Behavior::select('is_open')->where('is_open',1)->count();
-            //有效触发次数
-            $effective_trigger = Behavior::select('effective_trigger')->sum('effective_trigger');
-            //总生成彩虹豆
-            $rainbow_beans = Behavior::select('rainbow_beans')->sum('rainbow_beans');
-            //总发放彩虹豆
-            $grant_rainbow_beans = Behavior::select('grant_rainbow_beans')->sum('grant_rainbow_beans');
-            //总未发放彩虹豆
-            $all_grant_beans = $rainbow_beans - $grant_rainbow_beans;
-            foreach ($behavior_list as $k=>$v){
-                $v['all_is_open'] = $is_open;
-                $v['all_effective_trigger'] = intval($effective_trigger);
-                $v['all_rainbow_beans'] = $rainbow_beans;
-                $v['all_grant_beans'] = $all_grant_beans;
-            }
-        }
+
         $fractal = new Manager();
         $resource = new Collection($behavior_list, new BehaviorTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($behavior_list));

app/Http/Controllers/Behavior/CommentRecordController.php

@@ -86,12 +86,7 @@ class CommentRecordController extends Controller
                 'name',
                 'relative_series',
                 'is_open',
-                'bahavior_created_at',
-                'all_trigger_times',
-                'all_effective_trigger',
-                'all_physical_exertion',
-                'all_generation_quantity',
-                'all_quantity_issued'
+                'bahavior_created_at'
             ]
         ];
         return $data;

app/Transformers/Behavior/BehaviorTransformer.php

@@ -37,10 +37,6 @@ class BehaviorTransformer extends TransformerAbstract
             'grant_rainbow_beans' => $behavior_list['grant_rainbow_beans'],
             'created_at' => date($behavior_list['created_at']),
             'updated_at' => date($behavior_list['updated_at']),
-            'all_is_open' => $behavior_list['all_is_open'],//总已开启行为数
-            'all_effective_trigger' => $behavior_list['all_effective_trigger'],//有效触发数
-            'all_rainbow_beans' => $behavior_list['all_rainbow_beans'],//总生成彩虹豆
-            'all_grant_beans' => $behavior_list['all_grant_beans'],//总未发放彩虹豆
         ];
     }
 }