From 8c895ee79a734ffe207ff827aca3c9d0f804a4eb Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 6 Sep 2024 11:31:51 +0800 Subject: [PATCH 1/2] 123 --- app/api/controller/Invite.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/api/controller/Invite.php b/app/api/controller/Invite.php index 16483459..3559fac2 100644 --- a/app/api/controller/Invite.php +++ b/app/api/controller/Invite.php @@ -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(); $user_ids = $model->inviteeUserIds(); @@ -125,6 +126,7 @@ class Invite extends Controller $data['total'] = $list->total(); //审核通过 $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(); From 1b368a55c34b87ae1e9c6751fb22dd1728919a8e Mon Sep 17 00:00:00 2001 From: zengyyh Date: Mon, 9 Sep 2024 10:48:10 +0800 Subject: [PATCH 2/2] 123 --- app/api/controller/Invite.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/Invite.php b/app/api/controller/Invite.php index 3559fac2..f0b69e01 100644 --- a/app/api/controller/Invite.php +++ b/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; @@ -139,7 +139,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.查询当前用户邀请的人数,判断比较