Merge branch 'pifa' into fxshop

app/api/controller/Invite.php

@@ -93,7 +93,7 @@ class Invite extends Controller
     public function inviteWholesalerList(): Json
     {
                 //1.查询需要的邀请人数是多少
-        $setting = Setting::where(['key'=>'condition'])->field('values')->find();
+        $setting = Setting::where(['key'=>'commission'])->field('values')->find();
         $setting = json_decode($setting,true);
         $invite_num = $setting['values']['invite_num'] ?? 10;
         
@@ -101,6 +101,7 @@ class Invite extends Controller
         $adoption_num = 0;
         $data['total'] = 0;
         $data['adoption_num'] = $adoption_num."/".$invite_num;
+        $data['invite_num'] = 0;
         $data['refuse_num'] = 0;
         $model = new InviteLog();
         $storeId = $this->storeId;
@@ -130,6 +131,7 @@ class Invite extends Controller
             $invite_num = $setting['values']['invite_num'] ?? 10;
             //审核通过
             $adoption_num = $applyModel->whereIn('user_id', $user_ids)->where(['status' => WholesalerEnum::ADOPT])->count();
+            $data['invite_num'] = $adoption_num;
             $data['adoption_num'] = $adoption_num."/".$invite_num;
             //审核拒绝
             $data['refuse_num'] = $applyModel->whereIn('user_id', $user_ids)->where(['status' => WholesalerEnum::REFUSE])->count();
@@ -142,7 +144,7 @@ class Invite extends Controller
     {
         $storeId = $this->storeId;
         //1.查询需要的邀请人数是多少
-        $setting = Setting::where(['key'=>'condition'])->field('values')->find();
+        $setting = Setting::where(['key'=>'commission'])->field('values')->find();
         $setting = json_decode($setting,true);
         $invite_num = $setting['values']['invite_num'] ?? 10;
         //2.查询当前用户邀请的人数,判断比较