diff --git a/.gitignore b/.gitignore index b3327dd..aee0227 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,7 @@ extend/* vendor/* !vendor/vendor.zip -runtime/* \ No newline at end of file +runtime/* + +app/* +!app/controller/TestController.php \ No newline at end of file diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index c3d2736..d80db47 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -20,8 +20,4 @@ class IndexController View::assign('domain', \request()->domain()); return View::fetch(); } - public function test() - { - return View::fetch(); - } } diff --git a/app/controller/PayController.php b/app/controller/PayController.php index db80b3e..3008568 100644 --- a/app/controller/PayController.php +++ b/app/controller/PayController.php @@ -231,12 +231,12 @@ class PayController $Payclient = new $payclient_path($pay_config); // 获取支付明细 $records = $Payclient->getOrderInfo($query); - if ($records) { + if ($records['code'] === 0) { // 提交收款记录 - $upres = $this->payHeart($records, $config); + $upres = $this->payHeart($records['data'], $config); return $upres; } else { - return json(['code' => 0, 'msg' => '查询空订单'], 320); + return json(['code' => 0, 'msg' => $records['msg']], 320); } } // [定时任务]监听新订单,生成缓存 diff --git a/app/controller/api/PayManageController.php b/app/controller/api/PayManageController.php index b78ab9e..7a87ed9 100644 --- a/app/controller/api/PayManageController.php +++ b/app/controller/api/PayManageController.php @@ -170,11 +170,11 @@ class PayManageController extends BaseController $Payclient = new $payclient_path($pay_config); // 获取支付明细 $records = $Payclient->getOrderInfo($query); - if ($records) { + if ($records['code'] === 0) { // 收款流水 - return json(backMsg(0, '查询成功', $records)); + return json(backMsg(0, '查询成功', $records['data'])); } else { - return json(backMsg(1, '查询空订单')); + return json(['code' => 1, 'msg' => $records['msg']]); } } }