Преглед изворни кода

refactor(dev): 优化请求日志控制器和房屋服务

- 在 RequestLogController 中添加 Resource 属性,用于定义资源路由
-优化 HouseService 中的消耗条件检查逻辑
- 在 RequestLogRouter 中添加空数组初始化,提高代码可读性
notfff пре 7 месеци
родитељ
комит
0294710a74

+ 2 - 0
app/Module/Dev/AdminControllers/RequestLogController.php

@@ -9,6 +9,7 @@ use App\Module\System\Cache\RequestLogRouter;
 use App\Module\System\Repositorys\RequireLog;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Spatie\RouteAttributes\Attributes\Resource;
 use UCore\DcatAdmin\GridHelper;
 
 use function __;
@@ -17,6 +18,7 @@ use function __;
  * 请求日志
  *
  */
+#[Resource('dev-request-logs',names: 'dcat.admin.dev-request-logs')]
 class RequestLogController extends AdminController
 {
 

+ 4 - 6
app/Module/Farm/Services/HouseService.php

@@ -120,14 +120,12 @@ class HouseService
             // 检查消耗条件
             $checkResult = \App\Module\Game\Services\ConsumeService::checkConsume($userId, $consumeGroupId);
 
-            if(!$checkResult['success']){
-                throw new LogicException($checkResult['message']);
+            if($checkResult->error){
+                throw new LogicException($checkResult->message);
             }
 
 
             return true;
-
-
     }
 
     /**
@@ -154,12 +152,12 @@ class HouseService
         try {
             // 执行消耗
             $consumeResult = \App\Module\Game\Services\ConsumeService::executeConsume($userId, $consumeGroupId, 'house_upgrade', $farmUser->id);
-            if (!$consumeResult['success']) {
+            if ($consumeResult->error) {
                 \Illuminate\Support\Facades\DB::rollBack();
 
                 return [
                     'success' => false,
-                    'message' => $consumeResult['message'] ?? '消耗材料失败',
+                    'message' => $consumeResult->message ?? '消耗材料失败',
                     'code'    => 'CONSUME_FAILED'
                 ];
             }

+ 1 - 0
app/Module/System/Cache/RequestLogRouter.php

@@ -34,6 +34,7 @@ class RequestLogRouter extends \App\Module\LCache\QueueJob
             ->distinct()
             ->pluck('router', 'router')
             ->toArray();
+        $res=[];
         foreach ($data as $k => $v) {
             if (in_array(substr($k, 0, 3), $parameter)) {
                 $res[$k] = $k;