up

app/Http/Controllers/Admin/StatisticsController.php

@@ -269,18 +269,18 @@ class StatisticsController extends CommonController
                 "patients" => function ($query) use ($before_datetime) {
                     $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
                 },
-                "oneBalance" => function ($query) use ($before_datetime) {
-                    $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
-                }
+//                "oneBalance" => function ($query) use ($before_datetime) {
+//                    $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
+//                }
             ])
-            ->whereHas("oneBalance", function ($query) use ($before_datetime) {
-                $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
-            })
-            ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
-                $query
-                    ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
-                    ->where("project_id", $project_id);
-            })
+//            ->whereHas("oneBalance", function ($query) use ($before_datetime) {
+//                $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
+//            })
+//            ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
+//                $query
+//                    ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
+//                    ->where("project_id", $project_id);
+//            })
             ->get();
 
         $laravel_duration = microtime(true) - LARAVEL_START;

resources/views/admin/statistics/customer-balance.blade.php

@@ -30,9 +30,9 @@
                                 @endforeach
                             </select>
 
-                            <label class="control-label mr-1">截止</label><input
-                                value="{{ date("Y-m-d",$before_datetime) }}" class="form-control" name="before_date"
-                                data-plugin="date-picker">
+{{--                            <label class="control-label mr-1">截止</label><input--}}
+{{--                                value="{{ date("Y-m-d",$before_datetime) }}" class="form-control" name="before_date"--}}
+{{--                                data-plugin="date-picker">--}}
                             <button type="submit" class="btn btn-primary ml-1">查询</button>
                         </form>
                     </div>
@@ -60,7 +60,7 @@
                                 <td class="p-1">{{ $item->mobile }}</td>
                                 <td class="p-1">{{ $item->patients->count() ? $item->patients->last()->name : "无" }}</td>
                                 <td class="p-1">{{ date("Y-m-d H:i:s",$before_datetime) }}</td>
-                                <td class="p-1">{{ $item->oneBalance ? $item->oneBalance->balance : "0" }}</td>
+                                <td class="p-1">{{ $item->balance }}</td>
                             </tr>
                         @endforeach
                         </tbody>