支付方式优化

app-ghs/controllers/OrderController.php

@@ -82,39 +82,44 @@ class OrderController extends BaseController
         $aliPayWay = dict::getDict('payWay', 'alipay');
         $payWay = Yii::$app->request->get('payWay', $wxPayWay);
         if ($payWay == $wxPayWay) {
-
-            $wx = Yii::getAlias("@vendor/wxPayApi_v3.0.10");
-            require_once($wx . '/lib/WxPay.Api.php');
-            require_once($wx . '/example/WxPay.NativePay.php');
-
-            //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
-            $wxPayType = 0;
-            if (httpUtil::isMiniProgram()) {
-                $wxPayType = 1;
-            }
-            $purchaseCapital = dict::getDict('capitalType', 'xhPurchase', 'id');
-            $attach = "couponId=0&capitalType=" . $purchaseCapital . '&wxPayType=' . $wxPayType;
-
-            $input = new \WxPayUnifiedOrder();
-            $input->SetBody($subject);
-            $input->SetOut_trade_no($orderSn);
-            $input->SetTotal_fee($totalFee * 100);
-            $input->SetAttach($attach);
-            $input->SetTime_start(date("YmdHis"));
-            $input->SetTime_expire(date("YmdHis", time() + 600));
-            $input->SetNotify_url(Yii::$app->params['hdHost'] . '/notice/wx-callback/');
-            $input->SetTrade_type("NATIVE");
-            //native支付必传
-            $input->SetProduct_id("hdCG_" . $cgId);
-
-            //获取微信商户号等信息
-            $sjExtend = WxOpenClass::getWxInfo();
-
-            $notify = new \NativePay();
-            $result = $notify->GetPayUrl($input, $sjExtend);
-            $url = $result["code_url"] ?? '';
-            if (empty($url)) {
-                util::success(['returnStatus' => 'FAILURE'], '二维码生成失败');
+            if (isset($order->wxPayUrl) && !empty($order->wxPayUrl)) {
+                $url = $order->wxPayUrl;
+            } else {
+                $wx = Yii::getAlias("@vendor/wxPayApi_v3.0.10");
+                require_once($wx . '/lib/WxPay.Api.php');
+                require_once($wx . '/example/WxPay.NativePay.php');
+
+                //流水类型、优惠卷、微信支付（h5还是小程序支付）类型 带到回调
+                $wxPayType = 0;
+                if (httpUtil::isMiniProgram()) {
+                    $wxPayType = 1;
+                }
+                $purchaseCapital = dict::getDict('capitalType', 'xhPurchase', 'id');
+                $attach = "couponId=0&capitalType=" . $purchaseCapital . '&wxPayType=' . $wxPayType;
+
+                $input = new \WxPayUnifiedOrder();
+                $input->SetBody($subject);
+                $input->SetOut_trade_no($orderSn);
+                $input->SetTotal_fee($totalFee * 100);
+                $input->SetAttach($attach);
+                $input->SetTime_start(date("YmdHis"));
+                $input->SetTime_expire(date("YmdHis", time() + 600));
+                $input->SetNotify_url(Yii::$app->params['hdHost'] . '/notice/wx-callback/');
+                $input->SetTrade_type("NATIVE");
+                //native支付必传
+                $input->SetProduct_id("hdCG_" . $cgId);
+
+                //获取微信商户号等信息
+                $sjExtend = WxOpenClass::getWxInfo();
+
+                $notify = new \NativePay();
+                $result = $notify->GetPayUrl($input, $sjExtend);
+                $url = $result["code_url"] ?? '';
+                if (empty($url)) {
+                    util::success(['returnStatus' => 'FAILURE'], '二维码生成失败');
+                }
+                $order->wxPayUrl = $url;
+                $order->save();
             }
             $suffixUrl = qrCodeUtil::generateShortTimeGatheringQrCode($url, $this->sjId, $this->shopId, $payWay);
             $payUrl = Yii::$app->params['ghsImgHost'] . $suffixUrl;
@@ -122,61 +127,68 @@ class OrderController extends BaseController
         }
         if ($payWay == $aliPayWay) {
 
-            $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/cg-ali-callback",
-                //最大查询重试次数
-                'MaxQueryRetry' => "10",
-                //查询间隔
-                'QueryDuration' => "3"
-            );
-
-            // 支付超时，线下扫码交易定义为5分钟
-            $timeExpress = "5m";
-
-            // 创建请求builder，设置请求参数
-            $qrPayRequestBuilder = new \AlipayTradePayContentBuilder();
-            $qrPayRequestBuilder->setOutTradeNo($outTradeNo);
-            $qrPayRequestBuilder->setTotalAmount($totalAmount);
-            $qrPayRequestBuilder->setTimeExpress($timeExpress);
-            $qrPayRequestBuilder->setSubject($subject);
-            $qrPayRequestBuilder->setBody($body);
-
-            // 调用barPay方法获取当面付应答
-            $qrPay = new \AlipayTradeService($config);
-            $qrPayResult = $qrPay->qrPay($qrPayRequestBuilder);
+            if (isset($order->aliPayUrl) && !empty($order->aliPayUrl)) {
+                $url = $order->aliPayUrl;
+            } else {
+                $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/cg-ali-callback",
+                    //最大查询重试次数
+                    'MaxQueryRetry' => "10",
+                    //查询间隔
+                    'QueryDuration' => "3"
+                );
+
+                // 支付超时，线下扫码交易定义为5分钟
+                $timeExpress = "5m";
+
+                // 创建请求builder，设置请求参数
+                $qrPayRequestBuilder = new \AlipayTradePayContentBuilder();
+                $qrPayRequestBuilder->setOutTradeNo($outTradeNo);
+                $qrPayRequestBuilder->setTotalAmount($totalAmount);
+                $qrPayRequestBuilder->setTimeExpress($timeExpress);
+                $qrPayRequestBuilder->setSubject($subject);
+                $qrPayRequestBuilder->setBody($body);
+
+                // 调用barPay方法获取当面付应答
+                $qrPay = new \AlipayTradeService($config);
+                $qrPayResult = $qrPay->qrPay($qrPayRequestBuilder);
+
+                if ($qrPayResult->getTradeStatus() != 'SUCCESS') {
+                    util::success(['returnStatus' => 'FAILURE'], '二维码生成失败..');
+                }
 
-            if ($qrPayResult->getTradeStatus() == 'SUCCESS') {
                 $respond = $qrPayResult->getResponse();
                 $url = $respond->qr_code ?? '';
                 if (empty($url)) {
                     util::success(['returnStatus' => 'FAILURE'], '二维码生成失败');
                 }
-                $suffixUrl = qrCodeUtil::generateShortTimeGatheringQrCode($url, $this->sjId, $this->shopId, $payWay);
-                $payUrl = Yii::$app->params['ghsImgHost'] . $suffixUrl;
-                util::success(['url' => $payUrl, 'returnStatus' => 'SUCCESS']);
+                $order->aliPayUrl = $url;
+                $order->save();
             }
-            util::success(['returnStatus' => 'FAILURE'], '二维码生成失败..');
+            $suffixUrl = qrCodeUtil::generateShortTimeGatheringQrCode($url, $this->sjId, $this->shopId, $payWay);
+            $payUrl = Yii::$app->params['ghsImgHost'] . $suffixUrl;
+            util::success(['url' => $payUrl, 'returnStatus' => 'SUCCESS']);
         }
         util::success(['returnStatus' => 'FAILURE'], '不支持的收款方式');
     }