From c54f16f5152a85e297e734be9f696d77ddb41fc5 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 5 Jan 2022 11:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=AE=B6=E7=AB=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/UserController.php | 1 + app/Admin/Forms/Settings/Unipush.php | 6 +++--- .../Commands/Distribution/PreIncomeJobCommand.php | 2 ++ app/Console/Commands/PushMessageCommand.php | 2 +- .../Http/Controllers/Merchant/MessageController.php | 3 ++- app/Endpoint/Api/routes.php | 2 ++ app/Models/MerchantMessage.php | 1 + database/seeders/AppSettingSeeder.php | 10 +++++----- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index f875afcd..dc174549 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -119,6 +119,7 @@ class UserController extends AdminController $grid->filter(function (Grid\Filter $filter) { $filter->panel(); $filter->like('phone')->width(3); + $filter->like('userInfo.nickname')->width(3); $filter->equal('userInfo.agent_level')->select(UserInfo::$agentLevelTexts)->width(3); $filter->between('created_at')->dateTime()->width(7); // $filter->between('userInfo.growth_value')->width(6); diff --git a/app/Admin/Forms/Settings/Unipush.php b/app/Admin/Forms/Settings/Unipush.php index 95312e78..444f8e3c 100644 --- a/app/Admin/Forms/Settings/Unipush.php +++ b/app/Admin/Forms/Settings/Unipush.php @@ -39,9 +39,9 @@ class Unipush extends Form $this->switch('is_use', '是否启用')->value($appSettings['is_use'] ?? 0); $this->text('mall_app_id', '商城APP_ID')->value($appSettings['mall_app_id'] ?? ''); - $this->text('mall_app_key', '商城APP_KEY')->value($appSettings['mall_app_id'] ?? ''); - $this->text('mall_app_secret', '商城APP_SECRET')->value($appSettings['mall_app_id'] ?? ''); - $this->text('mall_master_secret', '商城APP_MASTER_SECRET')->value($appSettings['mall_app_id'] ?? ''); + $this->text('mall_app_key', '商城APP_KEY')->value($appSettings['mall_app_key'] ?? ''); + $this->text('mall_app_secret', '商城APP_SECRET')->value($appSettings['mall_app_secret'] ?? ''); + $this->text('mall_master_secret', '商城APP_MASTER_SECRET')->value($appSettings['mall_master_secret'] ?? ''); $this->divider(); $this->switch('merchant_is_use', '是否启用')->value($appSettings['merchant_is_use'] ?? 0); diff --git a/app/Console/Commands/Distribution/PreIncomeJobCommand.php b/app/Console/Commands/Distribution/PreIncomeJobCommand.php index aebd4433..e8b6b4aa 100644 --- a/app/Console/Commands/Distribution/PreIncomeJobCommand.php +++ b/app/Console/Commands/Distribution/PreIncomeJobCommand.php @@ -56,6 +56,8 @@ class PreIncomeJobCommand extends Command ]); } } + + //发送商家端预收益进帐消息 try { DB::beginTransaction(); switch (get_class($job->jobable)) { diff --git a/app/Console/Commands/PushMessageCommand.php b/app/Console/Commands/PushMessageCommand.php index 27bd5288..f03ab6df 100644 --- a/app/Console/Commands/PushMessageCommand.php +++ b/app/Console/Commands/PushMessageCommand.php @@ -47,7 +47,7 @@ class PushMessageCommand extends Command $status = $mallPushService->push($task->sn, $task->message) ? 1 : 2; } } elseif ($task->message instanceof MerchantMessage) { - if ((bool) app_settings('unipush.is_use')) {//如果开启了推送 + if ((bool) app_settings('unipush.merchant_is_use')) {//如果开启了推送 $status = $merchantPushService->push($task->sn, $task->message) ? 1 : 2; } } diff --git a/app/Endpoint/Api/Http/Controllers/Merchant/MessageController.php b/app/Endpoint/Api/Http/Controllers/Merchant/MessageController.php index 1d0565b4..8e313473 100644 --- a/app/Endpoint/Api/Http/Controllers/Merchant/MessageController.php +++ b/app/Endpoint/Api/Http/Controllers/Merchant/MessageController.php @@ -1,7 +1,8 @@ 'JX33P0wP8bAQprI953hpN6', 'mall_app_secret' => 'a3u3B6lXjq6fPTBlOGiOc9', 'mall_master_secret' => 'MAxmqomwo597xJeDuMCvx1', - 'merchant_is_use' => false, - 'merchant_app_id' => '', - 'merchant_app_key' => '', - 'merchant_app_secret' => '', - 'merchant_master_secret' => '', + 'merchant_is_use' => true, + 'merchant_app_id' => '5bvlKxO8RK7lCTc9DINcx5', + 'merchant_app_key' => 'qrPLowCchvArbpMKoPlMV1', + 'merchant_app_secret' => '5k36Jo49EAAGBDvR0cFqG3', + 'merchant_master_secret' => 'HCB87uFoF18iWsKHf7VY57', ], 'remarks' => '个推配置', ],