mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-05-10 17:56:02 +08:00
parent ee81f18076
commit aca3848654
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/ExceptionHandler.php
View File

@ -2,6 +2,7 @@
namespace App; namespace App;
use app\common\service\JsonService;
use Next\VarDumper\Dumper; use Next\VarDumper\Dumper;
use Next\VarDumper\DumperHandler; use Next\VarDumper\DumperHandler;
use support\exception\Handler; use support\exception\Handler;
@ -16,9 +17,10 @@ class ExceptionHandler extends Handler
public function render(Request $request, Throwable $exception): Response public function render(Request $request, Throwable $exception): Response
{ {
if ($exception instanceof Dumper) { // if ($exception instanceof Dumper) {
return \response(self::convertToHtml($exception)); // return \response(self::convertToHtml($exception));
} // }
return parent::render($request, $exception); // return parent::render($request, $exception);
return json(json_decode($exception->getMessage(),true));
} }
} }

6
app/admin/logic/merchant/MerchantLogic.php
View File

@ -54,7 +54,8 @@ class MerchantLogic extends BaseLogic
'mer_money' => $params['mer_money'], 'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'] ?? '', 'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? '' 'financial_alipay' => $params['financial_alipay'] ?? '',
'financial_type' => $params['financial_type'] ?? ''
]); ]);
Db::commit(); Db::commit();
@ -104,7 +105,8 @@ class MerchantLogic extends BaseLogic
'mer_money' => $params['mer_money'], 'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'] ?? '', 'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? '' 'financial_alipay' => $params['financial_alipay'] ?? '',
'financial_type' => $params['financial_type'] ?? ''
]); ]);
Db::commit(); Db::commit();

2
app/admin/validate/merchant/MerchantValidate.php
View File

@ -68,7 +68,7 @@ class MerchantValidate extends BaseValidate
*/ */
public function sceneAdd() public function sceneAdd()
{ {
return $this->remove('id',true); return $this->remove('mer_id',true);
} }