|
|
@@ -65,7 +65,8 @@ class OrderController extends BaseController
|
|
|
//支付成功
|
|
|
$transactionId = $payReturn['transaction_id'] ?? '';
|
|
|
$openId = $payReturn['openid'] ?? '';
|
|
|
- PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId);
|
|
|
+ $aliUserId = '';
|
|
|
+ PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId, $aliUserId);
|
|
|
util::success(['returnStatus' => 'SUCCESS']);
|
|
|
} else if ($payReturn["trade_state"] == "USERPAYING") {
|
|
|
//用户支付中
|
|
|
@@ -80,6 +81,50 @@ class OrderController extends BaseController
|
|
|
}
|
|
|
} elseif ($payWay == dict::getDict('payWay', 'alipay')) {
|
|
|
//支付宝付款
|
|
|
+
|
|
|
+ $aliF2F = Yii::getAlias("@vendor/alipayF2F");
|
|
|
+ require_once($aliF2F . '/f2fpay/model/builder/AlipayTradePayContentBuilder.php');
|
|
|
+ require_once($aliF2F . '/f2fpay/service/AlipayTradeService.php');
|
|
|
+
|
|
|
+ $aliPId = '2017041906821571';
|
|
|
+ $aliKey = 'MIIEpAIBAAKCAQEAvbeu6o90L+0AilI+mbhuJJH0lUv7hWQCEC+XUc+cWlC9ulKC3cSVScVLJHpUc09aj6v/iD1p9iVfgMxjeADNVKiQC2RJyRshAjzyTq+2bTcODp619iV2y4qW8UM65VcP7Ide3P0uT5xC2ReW0HpkdHZgm4F+P7mh1VhGt9qOP3hjvoraAHhtGACvsGvy8H69HhSAG+CEmFt7f2tKNWJ8xEUvkfhDvys93PfTk4xMWj048hJE2r38+2mWI/Il5dFQHWXXTVl2x9yi7uhEEW42a+7s9Q3HgqEvZiQ2NI1FTeEAPLFBApiEsNLY/smaszwqqfWGAyTMvtQ6T4K96GcTLQIDAQABAoIBAHwYTj33n9RJfnT73x7F2KXrIsUVcmyKQh88QgqtdmRNNA1QM3HESLJ8bu5pZhwW5/HaW8dOBKWRRKsHBnlUbPrXV4FcFDeLm0fPfd+iZ/2AaZ1+ix962f3BpYIiq7+f9zaMRazfnw9L8x31pByyMktLs12EkoQ0dHsMxxUzzKAOiiPnvCn8Pv+Jb2qej8GXgCjefutCVNMWGsdwJtMVXEbpdmMa48Wvw+0In5ZS/UG39YAreFzgDqI9jWHE1ZhkGmB1+8hKpeIlEeVGAeYVveUgssMORdA/YY8SWHk26KSIFXBrmdKjAcRJ8Q7ZHUmzIqAV+IMV+RD4J5mZHeJgdAECgYEA8J+Hp1M6eYbT4CPLXa//yRP6Xo+qSzrKHaRB1LRAjYhvKpx/TQetYpNCJ5bWpa+Jp0T5R21pzuYaJkPuGlNEHA13b5T3r1l2ltomSEdaShvD5EZ9WtErYV5zpSv7FjjIGkbwa0H3A8Ydnvw5z4A9TZjjHLjC2GtVGJReqHGglMECgYEAydddA4NRPxmXvIjjmLb1Ft1qwHuyv3vvWhi50foGZXNEnBcfP/OkfyBDDpOEu34GZBMXK9ykHBs1l93OEFGXh7AwW0Lp5lARahBEfBZgPjq5yPO8TOJZrb5hVcuvoDdGjxpRh93XDnQDhWS/1IvUcBLcIsTcnVvfrkX4NLxF/W0CgYEAxamG+gD4rBQBwMImsRN+/2MV7M//iEUG+0qPeXeI/7rv9wUP3etMlwl48qSKNxj37xxN2ksa/Acxu/VZhu6XqKO3VUX+IWFQdaNGh2F13iLozIDLQOtKw3WfcjOq0xpZ5pwXq0RI8iSw+IUhyD8EHNZW2qU8CiRBhyt6hsywqQECgYBa8+06FAachI/XqWfF/UvcDdJ5AkS9/L8SvmmdsSkItjSIkfLHAqdxkbwl6Vu6kUOX/PJIFZjuAWTZFl4xBFNgFYj01uZHnnT6cnIp6HteD2CAqTSFAMqgfFWoL6zoaYAmJBnxO4oZPTYI+ilnQcts5VLFaChx0GCvS2BZgy2W0QKBgQDjP2VtRq4aVSLUq2z1KIDI7GJBbOM5KSW1OEj4sfEdViozPh3Ar/FQWiij1oCZF+iJdKkonHoDbDd+Q0ykcpQ+5Gv07iiT8wJYFR/0j8g2kfql7bVQhGSBeBMS5sawKR3CvkfW73WX+CNnf0PklTY0kTyt6WRXDnKSeyxFVwSZ7g==';
|
|
|
+ $aliPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB';
|
|
|
+
|
|
|
+ $config = array(
|
|
|
+ //签名方式,默认为RSA2(RSA2048)
|
|
|
+ 'sign_type' => "RSA2",
|
|
|
+ //支付宝公钥
|
|
|
+ 'alipay_public_key' => $aliPublicKey,
|
|
|
+ //商户私钥
|
|
|
+ 'merchant_private_key' => $aliKey,
|
|
|
+ //编码格式
|
|
|
+ 'charset' => "UTF-8",
|
|
|
+ //支付宝网关
|
|
|
+ 'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
|
|
|
+ //应用ID
|
|
|
+ 'app_id' => $aliPId,
|
|
|
+ //异步通知地址,只有扫码支付预下单可用
|
|
|
+ 'notify_url' => Yii::$app->params['hdHost'] . "/notice/ali-callback",
|
|
|
+ //最大查询重试次数
|
|
|
+ 'MaxQueryRetry' => "10",
|
|
|
+ //查询间隔
|
|
|
+ 'QueryDuration' => "3"
|
|
|
+ );
|
|
|
+
|
|
|
+ //构造查询业务请求参数对象
|
|
|
+ $queryContentBuilder = new AlipayTradeQueryContentBuilder();
|
|
|
+ $queryContentBuilder->setOutTradeNo($orderSn);
|
|
|
+
|
|
|
+ //初始化类对象,调用queryTradeResult方法获取查询应答
|
|
|
+ $queryResponse = new \AlipayTradeService($config);
|
|
|
+ $queryResult = $queryResponse->queryTradeResult($queryContentBuilder);
|
|
|
+ if ($queryResult->getTradeStatus() == 'SUCCESS') {
|
|
|
+ $respond = $queryResult->getResponse();
|
|
|
+ $openId = '';
|
|
|
+ $aliUserId = $respond->buyer_user_id ?? '';
|
|
|
+ $transactionId = $respond->trade_no ?? '';
|
|
|
+ PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId, $aliUserId);
|
|
|
+ }
|
|
|
} else {
|
|
|
util::fail('未知付款方式');
|
|
|
}
|
|
|
@@ -129,37 +174,44 @@ class OrderController extends BaseController
|
|
|
|
|
|
if ($isWx) {
|
|
|
|
|
|
- try {
|
|
|
+ $order->payWay = dict::getDict('payWay', 'wxPay');
|
|
|
+ $order->save();
|
|
|
+ $cg->payWay = dict::getDict('payWay', 'wxPay');
|
|
|
+ $cg->save();
|
|
|
|
|
|
- $wx = Yii::getAlias("@vendor/wxPayApi_v3.0.10");
|
|
|
- require_once($wx . '/lib/WxPay.Api.php');
|
|
|
- require_once($wx . '/example/WxPay.MicroPay.php');
|
|
|
+ $wx = Yii::getAlias("@vendor/wxPayApi_v3.0.10");
|
|
|
+ require_once($wx . '/lib/WxPay.Api.php');
|
|
|
+ require_once($wx . '/example/WxPay.MicroPay.php');
|
|
|
|
|
|
- $input = new \WxPayMicroPay();
|
|
|
- $input->SetAuth_code($authCode);
|
|
|
- $input->SetBody($subject);
|
|
|
- $input->SetTotal_fee($totalFee * 100);
|
|
|
- $input->SetOut_trade_no($orderSn);
|
|
|
+ $input = new \WxPayMicroPay();
|
|
|
+ $input->SetAuth_code($authCode);
|
|
|
+ $input->SetBody($subject);
|
|
|
+ $input->SetTotal_fee($totalFee * 100);
|
|
|
+ $input->SetOut_trade_no($orderSn);
|
|
|
|
|
|
- //获取微信商户号等信息
|
|
|
- $sjExtend = WxOpenClass::getGhsWxInfo();
|
|
|
+ //获取微信商户号等信息
|
|
|
+ $sjExtend = WxOpenClass::getGhsWxInfo();
|
|
|
|
|
|
- $microPay = new \MicroPay();
|
|
|
- $res = $microPay->pay($input, $sjExtend);
|
|
|
- if (isset($res["return_code"]) && $res["return_code"] == "SUCCESS" && isset($res["result_code"]) && $res["result_code"] == 'SUCCESS') {
|
|
|
- $transactionId = $res['transaction_id'] ?? '';
|
|
|
- $openId = $res['openid'] ?? '';
|
|
|
- $payWay = dict::getDict('payWay', 'wxPay');
|
|
|
- PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId);
|
|
|
- util::success(['returnStatus' => 'SUCCESS']);
|
|
|
- }
|
|
|
- util::complete('');
|
|
|
- } catch (\Exception $e) {
|
|
|
- Yii::info($e->getMessage());
|
|
|
- util::fail('支付失败,请查询订单支付结果');
|
|
|
+ $microPay = new \MicroPay();
|
|
|
+ $res = $microPay->pay($input, $sjExtend);
|
|
|
+ if (isset($res["return_code"]) && $res["return_code"] == "SUCCESS" && isset($res["result_code"]) && $res["result_code"] == 'SUCCESS') {
|
|
|
+ $transactionId = $res['transaction_id'] ?? '';
|
|
|
+ $openId = $res['openid'] ?? '';
|
|
|
+ $aliUserId = '';
|
|
|
+ $payWay = dict::getDict('payWay', 'wxPay');
|
|
|
+ PurchaseService::codePay($payWay, $orderSn, $transactionId, $openId, $aliUserId);
|
|
|
+ util::success(['returnStatus' => 'SUCCESS']);
|
|
|
}
|
|
|
+ util::complete('');
|
|
|
+
|
|
|
} else {
|
|
|
|
|
|
+ $aliPayWay = dict::getDict('payWay', 'alipay');
|
|
|
+ $order->payWay = $aliPayWay;
|
|
|
+ $order->save();
|
|
|
+ $cg->payWay = $aliPayWay;
|
|
|
+ $cg->save();
|
|
|
+
|
|
|
$aliF2F = Yii::getAlias("@vendor/alipayF2F");
|
|
|
require_once($aliF2F . '/f2fpay/model/builder/AlipayTradePayContentBuilder.php');
|
|
|
require_once($aliF2F . '/f2fpay/service/AlipayTradeService.php');
|
|
|
@@ -205,22 +257,12 @@ class OrderController extends BaseController
|
|
|
$barPay = new \AlipayTradeService($config);
|
|
|
$barPayResult = $barPay->barPay($barPayRequestBuilder);
|
|
|
|
|
|
- switch ($barPayResult->getTradeStatus()) {
|
|
|
- case "SUCCESS":
|
|
|
-// if (!empty($barPayResult->getResponse())) {
|
|
|
-// print_r($barPayResult->getResponse());
|
|
|
-// }
|
|
|
- util::success(['returnStatus' => 'SUCCESS']);
|
|
|
- break;
|
|
|
- case "FAILED":
|
|
|
- util::fail('支付失败,请查看订单详情');
|
|
|
- break;
|
|
|
- case "UNKNOWN":
|
|
|
- util::fail('支付异常');
|
|
|
- break;
|
|
|
- default:
|
|
|
- util::fail('支付异常');
|
|
|
- break;
|
|
|
+ if ($barPayResult->getTradeStatus() == 'SUCCESS') {
|
|
|
+ $respond = $barPayResult->getResponse();
|
|
|
+ $openId = '';
|
|
|
+ $aliUserId = $respond->buyer_user_id ?? '';
|
|
|
+ $transactionId = $respond->trade_no ?? '';
|
|
|
+ PurchaseService::codePay($aliPayWay, $orderSn, $transactionId, $openId, $aliUserId);
|
|
|
}
|
|
|
}
|
|
|
}
|