完善功能

app/admin/controller/member/WellnessRecordController.php

@@ -251,15 +251,14 @@ class WellnessRecordController extends Curd
 //            $item->wellness_record_file_array = $itemNew;
             if (!empty($item->wellness_record_file_json)) {
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
-                $upload = SysUpload::whereIn('upload_file_path', $item->wellness_record_file_json)->get();
-                $itemNew = [];
-                foreach ($upload as $value) {
-                    $itemNew[] = [
-                        'url' => getenv('STORAGE_DOMAIN') . $value->upload_file_path,
-                        'name' => $value->upload_name
+                $wellnessRecordFileJson = [];
+                foreach ($item->wellness_record_file_json as $value) {
+                    $wellnessRecordFileJson[] = [
+                        'url' => getenv('STORAGE_DOMAIN') . $value['url'],
+                        'name' => $value['name']
                     ];
                 }
-                $item->wellness_record_file_array = $itemNew;
+                $item->wellness_record_file_json = $wellnessRecordFileJson;
             }
         }
 

app/admin/controller/statistics/MemberController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\admin\controller\statistics;
+
+use app\model\Member;
+
+class MemberController
+{
+    public function index()
+    {
+        // 权益会员数量
+        $memberCount = Member::where('member_is_owner', 'N')->count();
+        // 业主数量
+        $owner = Member::where('member_is_owner', 'N')->count();
+        // 用户总数
+        $userCount = $memberCount + $owner;
+        // 今日新增用户数
+        $todayTime = strtotime(date('Y-m-d 00:00:00'));
+        $todayCount = Member::where('member_addtimes', '>', $todayTime)->count();
+        // 本月新增用户数
+        $monthTime = strtotime(date('Y-m-01 00:00:00'));
+        $monthCount = Member::where('member_addtimes', '>', $monthTime)->count();
+
+    }
+}

app/admin/service/member/MemberService.php

@@ -245,6 +245,7 @@ class MemberService
         try {
             $data = [
                 'member_device_status' => $params['member_device_status'],
+                'member_device_key' => $params['member_device_key'],
                 'join_device_member_id' => $params['join_device_member_id'],
                 'member_device_config_json' => !empty($params['member_device_config_json']) ? $params['member_device_config_json'] : null,
                 'member_device_remark' => $params['member_device_remark'] ?? null,

route/admin.php

@@ -649,6 +649,12 @@ Route::group('/admin', function () {
             \app\middleware\AdminAuthCheck::class
         ]);
     });
+    /* 统计 */
+    Route::group('/statistics',function (){
+        Route::get('/member',[\app\admin\controller\statistics\MemberController::class,'index']);
+    })->middleware([
+        \app\middleware\AdminAuthCheck::class
+    ]);
     /* 客户端相关数据 */
     Route::group('/client', function () {
         Route::group('', function () {