完善功能

app/admin/controller/member/MemberController.php

@@ -97,6 +97,7 @@ class MemberController
     public function selectMemberAllQuota(Request $request){
         $memberId = $request->get('member_id','');
         $orderId = $request->get('order_id','');
+        $goodsId = $request->get('goods_id','');
         $person = $request->get('person','');
         $selectType = $request->get('select_type','ALL');
 
@@ -110,12 +111,16 @@ class MemberController
             ->select('member_benefit_id as id','member_benefit_name as name','member_benefit_limit_count as total','member_benefit_used_count as used')
             ->when($orderId != '',function($query) use ($orderId){
                 $query->where('join_benefit_order_id',$orderId);
+            })->when($goodsId != '',function($query) use ($goodsId){
+                $query->where('join_benefit_goods_id',$goodsId);
             })
             ->get()
             ->toArray();
 
-
         foreach($benefit as $item){
+            if ($item['total'] - $item['used'] == 0){
+                continue;
+            }
             if ($item['total'] - $item['used'] < $person){
                 $item['disabled'] = true;
             }
@@ -127,6 +132,10 @@ class MemberController
         }
         
         $quotas = MemberQuota::where('join_quota_member_id',$memberId)
+            ->when($goodsId != '',function($query) use ($goodsId){
+                $query->whereRaw("member_quota_json->'$[*].goods_id'",$goodsId);
+            })
+            
             ->selectRaw('join_quota_member_id,join_member_rule_added_component_id,COUNT(*) as total')
             ->groupBy('join_quota_member_id','join_member_rule_added_component_id')
             ->get()