diff --git a/niucloud/app/api/controller/sys/Index.php b/niucloud/app/api/controller/sys/Index.php index d526ebd6..d98e3822 100644 --- a/niucloud/app/api/controller/sys/Index.php +++ b/niucloud/app/api/controller/sys/Index.php @@ -103,22 +103,4 @@ class Index extends BaseController ]); } } - - public function testfun() - { - $obj = new CalculatePerformance(); - $obj->handle([ - 'customer_resources_id' => 7, - 'event_type' => 'add' - ]); - dd(123); - } - - public function testfun1() - { - $order_id = $this->request->get('order_id'); - $order_info = OrderTable::where(['id' => $order_id])->find(); - (new OrderTableService())->handlePaymentSuccess($order_info->toArray()); - dd($order_info); - } } diff --git a/niucloud/app/service/admin/sys/SystemService.php b/niucloud/app/service/admin/sys/SystemService.php index b413997c..0aec8ea0 100644 --- a/niucloud/app/service/admin/sys/SystemService.php +++ b/niucloud/app/service/admin/sys/SystemService.php @@ -671,12 +671,12 @@ class SystemService extends BaseAdminService //资源合计 $zy_total_task = array_sum(array_column($campus_list, 'month_task_num')); $zy_total_complete = array_sum(array_column($campus_list, 'month_zy_complete_num')); - $zy_complete_rate = $zy_total_complete > 0 ? round($zy_total_complete / $zy_total_task, 2) : 0; + $zy_complete_rate = $zy_total_task > 0 ? round($zy_total_complete / $zy_total_task, 2) : 0; $zy_month_visit_num = array_sum(array_column($campus_list, 'month_visit_num')); $zy_month_resource_num = array_sum(array_column($campus_list, 'month_resource_num')); - $zy_visit_complete_rate = $zy_month_visit_num > 0 ? round($zy_month_visit_num / $zy_month_resource_num, 2) : 0; + $zy_visit_complete_rate = $zy_month_resource_num > 0 ? round($zy_month_visit_num / $zy_month_resource_num, 2) : 0; //月度个人业绩情况 diff --git a/niucloud/app/service/api/apiService/ScheduleOptionsService.php b/niucloud/app/service/api/apiService/ScheduleOptionsService.php index 2d3fa1dd..765c3167 100644 --- a/niucloud/app/service/api/apiService/ScheduleOptionsService.php +++ b/niucloud/app/service/api/apiService/ScheduleOptionsService.php @@ -185,9 +185,6 @@ class ScheduleOptionsService extends BaseApiService $query->where('course_type', $filters['course_type']); } - // TODO: 课程表暂时没有campus_id字段,后续需要添加 - // 课程通常是全局的,不按校区过滤,但可以通过其他关联表来实现校区过滤 - $courses = $query->order('id desc')->select()->toArray(); return $courses;