diff --git a/app/Http/Controllers/Guest/OrderController.php b/app/Http/Controllers/Guest/OrderController.php index 77634887..c1a27824 100644 --- a/app/Http/Controllers/Guest/OrderController.php +++ b/app/Http/Controllers/Guest/OrderController.php @@ -109,26 +109,15 @@ class OrderController extends Controller ]; $strToSign = $bitpayX->prepareSignId($inputJSON['merchant_order_id']); if (!$bitpayX->verify($strToSign, $inputJSON['token'])) { - die([ - 'status' => 400, - 'error' => 'sign error' - ]); + abort(500, 'sign error'); } if ($params['status'] !== 'PAID') { - die([ - 'status' => 400, - 'error' => 'order is not paid' - ]); + abort(500, 'order is not paid'); } if (!$this->handle($params['merchant_order_id'], $params['order_id'])) { - die([ - 'status' => 400, - 'error' => 'order process fail' - ]); + abort(500, 'order process fail'); } - die([ - 'status' => 200 - ]); + die('success'); } public function payTaroNotify(Request $request) diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index f911f362..55565bde 100755 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -396,7 +396,7 @@ class OrderController extends Controller { $bitpayX = new BitpayX(config('v2board.bitpayx_appsecret')); $params = [ - 'merchant_order_id' => 'V2Board_' . $order->trade_no, + 'merchant_order_id' => $order->trade_no, 'price_amount' => $order->total_amount / 100, 'price_currency' => 'CNY', 'title' => '支付单号:' . $order->trade_no, diff --git a/install.sql b/install.sql index b6cac598..890b740b 100644 --- a/install.sql +++ b/install.sql @@ -68,7 +68,6 @@ CREATE TABLE `v2_order` ( `plan_id` int(11) NOT NULL, `type` int(11) NOT NULL COMMENT '1新购2续费3升级', `cycle` varchar(255) NOT NULL, - `method` tinyint(1) DEFAULT NULL COMMENT '支付方式', `trade_no` varchar(36) NOT NULL, `callback_no` varchar(255) DEFAULT NULL, `total_amount` int(11) NOT NULL, @@ -223,4 +222,4 @@ CREATE TABLE `v2_user` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --- 2020-01-20 08:47:41 \ No newline at end of file +-- 2020-01-20 15:33:23 \ No newline at end of file diff --git a/update.sql b/update.sql index 561e077e..aaba2086 100644 --- a/update.sql +++ b/update.sql @@ -127,4 +127,7 @@ INSERT INTO `v2_tutorial` (`id`, `title`, `description`, `icon`, `steps`, `show` (4, 'iOS', '兼容 iOS 9 以上的版本', 'fab fa-2x fa-apple', '[{\"default_area\":\"
iOS上使用请在iOS浏览器中打开本页
\"},{\"default_area\":\"
在 App Store 登录本站提供的美区 Apple ID 下载客户端。
为了保护您的隐私,请勿在手机设置里直接登录,仅在 App Store 登录即可。
登陆完成后点击下方下载会自动唤起下载。
\",\"safe_area\":\"
Apple ID:{{$apple_id}}
密码:点击复制密码
\",\"download_url\":\"https://apps.apple.com/us/app/shadowrocket/id932747118\",\"img_url\":\"https://i.loli.net/2019/11/21/5idkjJ61stWgREV.jpg\"},{\"default_area\":\"
待客户端安装完成后,点击下方一键订阅按钮会自动唤起并进行订阅
\",\"safe_area\":\"\",\"img_url\":\"https://i.loli.net/2019/11/21/ZcqlNMb3eg5Uhxd.jpg\",\"download_url\":\"shadowrocket://add/sub://{{$b64_subscribe_url}}?remark={{$app_name}}\"},{\"default_area\":\"
选择节点进行链接,首次链接过程授权窗口请一路允许。
\",\"img_url\":\"https://i.loli.net/2019/11/21/9Zdxksr7Ey6hjlm.jpg\"}]', 1, 1577982016, 1577983283); ALTER TABLE `v2_server_log` -CHANGE `rate` `rate` decimal(10,2) NOT NULL AFTER `d`; \ No newline at end of file +CHANGE `rate` `rate` decimal(10,2) NOT NULL AFTER `d`; + +ALTER TABLE `v2_order` +DROP `method`; \ No newline at end of file