diff --git a/app/Admin/Actions/ModifyOrderState.php b/app/Admin/Actions/ModifyOrderState.php deleted file mode 100644 index 4cc0f48..0000000 --- a/app/Admin/Actions/ModifyOrderState.php +++ /dev/null @@ -1,58 +0,0 @@ -getKey()); - - return $this->response()->success('Processed successfully.')->redirect('/'); - } - - /** - * @return string|array|void - */ - public function confirm() - { - // return ['Confirm?', 'contents']; - } - - /** - * @param Model|Authenticatable|HasPermissions|null $user - * - * @return bool - */ - protected function authorize($user): bool - { - return true; - } - - /** - * @return array - */ - protected function parameters() - { - return []; - } -} diff --git a/app/Admin/Common/Auth.php b/app/Admin/Common/Auth.php index a7baf1d..3006c3a 100644 --- a/app/Admin/Common/Auth.php +++ b/app/Admin/Common/Auth.php @@ -6,6 +6,7 @@ use App\Models\AdminRoles; use App\Models\AdminRoleUsers; use App\Models\AdminUsers; use App\Models\LanzuUserBalance; +use Dcat\Admin\Admin; use Dcat\Admin\Controllers\AdminController; use Illuminate\Support\Facades\Hash; @@ -58,4 +59,18 @@ class Auth extends AdminController //>>5.生成可提现金额信息 LanzuUserBalance::create($adu->id, $type); } + + /** + * 获取登陆账号对应的市场ID + * @return bool|mixed + */ + public static function getMarket() + { + $adu = Admin::user(); + if (in_array($adu->id,config('market_service.admin_user_id'))){ + $marketId = config('market_service.market_id')[$adu->id]; + return $marketId; + } + return false; + } } diff --git a/app/Admin/Controllers/AuthController.php b/app/Admin/Controllers/AuthController.php index 8a27be2..fe2e55d 100644 --- a/app/Admin/Controllers/AuthController.php +++ b/app/Admin/Controllers/AuthController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Models\AdminUsers; +use Dcat\Admin\Admin; use Dcat\Admin\Controllers\AuthController as BaseAuthController; use Illuminate\Http\Request; @@ -19,4 +20,5 @@ class AuthController extends BaseAuthController } return parent::postLogin($request); } + } diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php index a71252f..e74167b 100644 --- a/app/Admin/Controllers/ImsCjdcOrderMainController.php +++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php @@ -2,6 +2,7 @@ namespace App\Admin\Controllers; +use App\Admin\Common\Auth; use App\Admin\Common\Rpc; use App\Admin\Extensions\CheckRow; use App\Admin\Extensions\MyDetailPage; @@ -10,6 +11,10 @@ use App\Admin\Extensions\OrderPrint; use App\Admin\Extensions\OrderRefund; use App\Admin\Extensions\OrderStateHandle; use App\Admin\Repositories\ImsCjdcOrderMain; +use App\Models\ImsCjdcMarket; +use App\Models\LanzuMarket; +use App\Models\LanzuMpInfo; +use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Layout\Content; @@ -36,9 +41,13 @@ class ImsCjdcOrderMainController extends AdminController $grid->paginate(10);//每页展示数据10条 //$grid->id; //$grid->user_id('用户信息'); + $marketId = Auth::getMarket(); + if ($marketId){ + $grid->model()->where('market_id',$marketId); + } + $grid->column('nick_name', '用户信息'); $grid->order_num; - $grid->state('订单状态') ->using(config('order.state')) ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning']); diff --git a/config/market_service.php b/config/market_service.php new file mode 100644 index 0000000..15e5df0 --- /dev/null +++ b/config/market_service.php @@ -0,0 +1,5 @@ +[98,99], + 'market_id'=>[98=>1,99=>2] +];