Merge branch 'master' of e.coding.net:g-ueau9359/kku/kku_laravel

* 'master' of e.coding.net:g-ueau9359/kku/kku_laravel:
  refactor(admin): 重构数据网格展示逻辑
  refactor(admin): 优化农贸市场仓库管理和用户管理界面

UCore/DcatAdmin/GridHelper.php

@@ -32,9 +32,8 @@ class GridHelper
     {
         $this->grid = $grid;
         $grid->filter(function (Grid\Filter $filter) {
-            // $filter->panel();
-
-            // $filter->expand();
+             $filter->panel();
+             $filter->expand();
         });
         $this->controller = $controller;
         if (request('in_iframe')) {

app/Module/Mex/AdminControllers/MexPriceConfigController.php

@@ -2,6 +2,7 @@
 
 namespace App\Module\Mex\AdminControllers;
 
+use App\Module\Mex\AdminControllers\Helper\GridHelper;
 use App\Module\Mex\Repositories\MexPriceConfigRepository;
 use App\Module\Mex\Models\MexPriceConfig;
 use Spatie\RouteAttributes\Attributes\Resource;
@@ -33,6 +34,7 @@ class MexPriceConfigController extends AdminController
     protected function grid()
     {
         return Grid::make(new MexPriceConfigRepository( ['item']), function (Grid $grid) {
+            $helper = new GridHelper($grid,$this);
             $grid->column('id', 'ID')->sortable();
             $grid->column('item_id', '商品ID')->link(function ($value) {
                 return admin_url("game-items/{$value}");
@@ -46,8 +48,8 @@ class MexPriceConfigController extends AdminController
             });
             $grid->column('protection_threshold', '保护阈值');
             $grid->column('is_enabled', '启用状态')->bool();
-            $grid->column('created_at', '创建时间')->sortable();
-            $grid->column('updated_at', '更新时间');
+            $helper->columnCreatedAt();
+            $helper->columnUpdatedAt();
 
             // 筛选器
             $grid->filter(function (Grid\Filter $filter) {

app/Module/Mex/AdminControllers/MexWarehouseController.php

@@ -2,6 +2,7 @@
 
 namespace App\Module\Mex\AdminControllers;
 
+use App\Module\Mex\AdminControllers\Helper\GridHelper;
 use App\Module\Mex\Repositories\MexWarehouseRepository;
 use App\Module\Fund\Models\FundModel;
 use App\Module\Fund\Enums\FUND_TYPE;
@@ -15,7 +16,7 @@ use Dcat\Admin\Widgets\Tab;
 
 /**
  * 农贸市场仓库管理
- * 
+ *
  * 路由：/admin/mex-warehouse
  */
 #[Resource('mex-warehouse', names: 'dcat.admin.mex-warehouse')]
@@ -54,6 +55,8 @@ class MexWarehouseController extends AdminController
     protected function itemWarehouseGrid()
     {
         return Grid::make(new MexWarehouseRepository(), function (Grid $grid) {
+            $helper = new GridHelper($grid,$this);
+
             $grid->column('id', 'ID')->sortable();
             $grid->column('item_id', '商品ID')->display(function ($value) {
                 return "<a href='" . admin_url("game-items/{$value}") . "' target='_blank'>{$value}</a>";
@@ -87,8 +90,8 @@ class MexWarehouseController extends AdminController
                 }
                 return '-';
             });
-            $grid->column('last_transaction_at', '最后交易时间');
 
+            $helper->columnDateTime('last_transaction_at','最后交易时间');
             // 禁用新增、编辑和删除
             $grid->disableCreateButton();
             $grid->disableEditButton();
@@ -139,7 +142,7 @@ class MexWarehouseController extends AdminController
         return Show::make($id, new MexWarehouseRepository(), function (Show $show) {
             $show->field('id', 'ID');
             $show->field('item_id', '商品ID');
-            
+
             $show->divider('库存信息');
             $show->field('quantity', '当前库存');
             $show->field('total_buy_quantity', '累计买入数量');
@@ -168,7 +171,7 @@ class MexWarehouseController extends AdminController
                 }
                 return '0.00000';
             });
-            
+
             $show->field('last_transaction_at', '最后交易时间');
 
             // 禁用编辑和删除
@@ -215,6 +218,8 @@ class MexWarehouseController extends AdminController
             $grid->model()->where('user_id', $warehouseUserId);
 
             $grid->column('id', 'ID')->sortable();
+            $grid->column('user_id', 'user_id');
+
             $grid->column('fund_id', '资金类型')->display(function ($value) {
                 return self::getFundTypeName($value);
             });

app/Module/Mex/Logic/MexMatchLogic.php

@@ -972,8 +972,6 @@ class MexMatchLogic
     private static function transferFrozenItemsToWarehouse(int $userId, int $itemId, int $quantity, int $orderId): array
     {
         try {
-            // TODO: 这里需要实现从用户冻结物品转移到仓库的逻辑
-            // 由于物品冻结功能比较复杂，这里先返回成功，后续完善
 
             // 消耗用户物品（包括冻结的物品）
             $result = ItemService::consumeItem($userId, $itemId, null, $quantity, [

app/Module/User/AdminControllers/UserController.php

@@ -158,13 +158,7 @@ class UserController extends AdminController
                 ->required()
                 ->rules('required|max:100');
 
-            $form->password('password', '密码')
-                ->help('不修改请留空')
-                ->saving(function ($value) {
-                    if ($value) {
-                        return \Illuminate\Support\Facades\Hash::make($value);
-                    }
-                });
+
 
             $form->radio('status2', '状态')
                 ->options([
@@ -176,8 +170,7 @@ class UserController extends AdminController
                 ])
                 ->default(STATUS2::Normal->value);
 
-            // 添加其他特殊字段
-            $form->text('google2fa_secret', 'Google双因素密钥');
+
 
             $form->display('created_at', '创建时间');
             $form->display('updated_at', '更新时间');