diff --git a/extend/payment/Baidu.php b/extend/payment/Baidu.php index a9f3f4bab107bd4cb814519686f3d80b1a086a80..a1510e05e1bf32c8cb829f4764f31fe9f96cdb3b 100644 --- a/extend/payment/Baidu.php +++ b/extend/payment/Baidu.php @@ -184,30 +184,18 @@ class Baidu */ public function Respond($params = []) { - $data = empty($_POST) ? $_GET : array_merge($_GET, $_POST); - ksort($data); - - // 参数字符串 - $prestr = ''; - foreach($data AS $key=>$val) - { - if ($key != 'sign' && $key != 'sign_type' && $key != 'code') - { - $prestr .= "$key=$val&"; - } - } - $prestr = substr($prestr, 0, -1); - + file_put_contents(ROOT.'bbbbbb.txt', json_encode($params)); + // 签名 - if(!$this->OutRsaVerify($prestr, $data['sign'])) + if(!$this->checkSignWithRsa($params)) { return DataReturn('签名校验失败', -1); } // 支付状态 - if(!empty($data['trade_no']) || (isset($data['trade_status']) && in_array($data['trade_status'], ['TRADE_SUCCESS', 'TRADE_FINISHED']))) + if(isset($params['status']) && $params['status'] == 2) { - return DataReturn('支付成功', 0, $this->ReturnData($data)); + return DataReturn('支付成功', 0, $this->ReturnData($params)); } return DataReturn('处理异常错误', -100); } @@ -223,11 +211,11 @@ class Baidu private function ReturnData($data) { // 返回数据固定基础参数 - $data['trade_no'] = $data['trade_no']; // 支付平台 - 订单号 - $data['buyer_user'] = $data['seller_id']; // 支付平台 - 用户 - $data['out_trade_no'] = $data['out_trade_no']; // 本系统发起支付的 - 订单号 + $data['trade_no'] = $data['orderId']; // 支付平台 - 订单号 + $data['buyer_user'] = $data['userId']; // 支付平台 - 用户 + $data['out_trade_no'] = $data['tpOrderId']; // 本系统发起支付的 - 订单号 $data['subject'] = isset($data['subject']) ? $data['subject'] : ''; // 本系统发起支付的 - 商品名称 - $data['pay_price'] = $data['total_amount']; // 本系统发起支付的 - 总价 + $data['pay_price'] = $data['totalMoney']/100; // 本系统发起支付的 - 总价 return $data; } @@ -284,7 +272,7 @@ class Baidu */ public function checkSignWithRsa(array $assocArr) { - if (!isset($assocArr['sign']) || empty($assocArr)) { + if (!isset($assocArr['rsaSign']) || empty($assocArr)) { return false; } @@ -292,8 +280,8 @@ class Baidu throw new Exception("openssl扩展不存在"); } - $sign = $assocArr['sign']; - unset($assocArr['sign']); + $rsaSign = $assocArr['rsaSign']; + unset($assocArr['rsaSign']); if (empty($assocArr)) { return false; diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 24507b5c9003fdd525a3e272def792eed10621b9..c7e83b79dc2aae63231dcaf1ef6ab44cc3097ca0 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -57,7 +57,7 @@ App({ // 请求地址 // request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - //request_url: 'https://test.shopxo.net/', + request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/baidu/pages/user-order/user-order.js b/public/appmini/old/baidu/pages/user-order/user-order.js index 65e67e35d26a6a5c861de93a8a619c64dcba5366..ac534cb4961445659b74f1ae911c8dde29a2df6a 100755 --- a/public/appmini/old/baidu/pages/user-order/user-order.js +++ b/public/appmini/old/baidu/pages/user-order/user-order.js @@ -224,18 +224,8 @@ Page({ } else { console.log(res.data.data.data) swan.requestPolymerPayment({ - orderInfo: { - "dealId": res.data.data.data.dealId, - "appKey": res.data.data.data.appKey, - "totalAmount": res.data.data.data.totalAmount, - "tpOrderId": res.data.data.data.tpOrderId, - "dealTitle": res.data.data.data.dealTitle, - "signFieldsRange": res.data.data.data.signFieldsRange, - "rsaSign": res.data.data.data.rsaSign, - "bizInfo": res.data.data.data.bizInfo - }, + orderInfo: res.data.data.data, success: function (res) { - console.log(res); // 数据设置 var temp_data_list = $this.data.data_list; temp_data_list[index]['status'] = 2; diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json index 3334eb870d293d3f23636c0240d20669d24ed1c9..a050bf44b9efc0a6b62b487b70f4603f64497627 100644 --- a/public/appmini/old/baidu/project.swan.json +++ b/public/appmini/old/baidu/project.swan.json @@ -1 +1 @@ -{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge"],"paths":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.json","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.css","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user/user.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.swan"]},"host":"baiduboxapp","preview":{"packageId":221324},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}} \ No newline at end of file +{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","expands":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/lib/online-service","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge"],"paths":["/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/slider/slider.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/index/index.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/app.json","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/popup/popup.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-search/goods-search.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/goods-detail/goods-detail.css","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/icon-nav/icon-nav.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/pages/user/user.swan","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.js","/Volumes/dev/data/www/project/shopxo/public/appmini/old/baidu/components/badge/badge.swan"]},"host":"baiduboxapp","preview":{"packageId":221505},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}} \ No newline at end of file