支付

app-ghs/controllers/OrderController.php

@@ -366,125 +366,30 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
 
-            $payWay = $cg->payWay ?? dict::getDict('payWay', 'wxPay');
             $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
-            if ($payWay == dict::getDict('payWay', 'wxPay')) {
-                //微信付款
-                $wx = Yii::getAlias("@vendor/wxPayApi_v3.0.10");
-                require_once($wx . '/lib/WxPay.Api.php');
-                require_once($wx . '/example/WxPay.MicroPay.php');
-
-                //获取微信商户号等信息
-                $sjExtend = WxOpenClass::getGhsWxInfo();
-
-                $microPay = new \MicroPay();
-                $payReturn = $microPay->query($orderSn, $sjExtend);
-                if ($payReturn["return_code"] == "SUCCESS" && $payReturn["result_code"] == "SUCCESS") {
-                    if ($payReturn["trade_state"] == "SUCCESS") {
-                        //支付成功
-                        $transactionId = $payReturn['transaction_id'] ?? '';
-                        $openId = $payReturn['openid'] ?? '';
-                        $aliUserId = '';
-
-
-                        $cg->onlinePay = dict::getDict('onlinePay', 'yes');
-                        $cg->codePay = 1;
-                        $cg->payOpenId = $openId;
-                        $cg->aliUserId = $aliUserId;
-                        //自取订单
-                        $cg->getType = PurchaseClass::GET_TYPE_SELF_GET;
-                        $cg->save();
-
-                        $order->onlinePay = dict::getDict('onlinePay', 'yes');
-                        $order->codePay = 1;
-                        //自取订单
-                        $order->sendType = OrderClass::SEND_TYPE_NO;
-                        $order->save();
-
-                        $attach = '';
-                        payUtil::thirdPay($payWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
-                        $transaction->commit();
 
+            $shop = $this->shop;
 
-                        $saleId = $order->id ?? 0;
-                        $order = OrderClass::getById($saleId, true);
-                        if (!empty($order)) {
-                            $shopId = $order->shopId ?? 0;
-                            $shop = ShopClass::getById($shopId, true);
-                            if (!empty($shop)) {
-                                //WxMessageClass::ghsHasNewOrderInform($shop, $order);
-                            }
-                            //订单生成时唤起在线打印
-                            if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
-                                if ($order->status != 1 && $order->status != 5) {
-                                    OrderClass::onlinePrint($order);
-                                    $order->printNum += 1;
-                                    $order->save();
-                                }
-                            }
-                            ShopExtClass::ghsGatheringReport($order);
-                        }
+            $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
+            $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/lkl-apigw-v1.cer';
+            $params = [
+                'appid' => 'OP00002119',
+                'serial_no' => '018b08cfddbd',
+                'merchant_no' => $shop->lklSjNo,
+                'term_no' => $shop->lklScanTermNo,
+                'merchantPrivateKeyPath' => $merchantPrivateKeyPath,
+                'lklCertificatePath' => $lklCertificatePath,
+            ];
+            $laResource = new Lakala($params);
+            $scanParams = ['orderSn' => $orderSn,];
+            $response = $laResource->query($scanParams);
 
-                        util::success(['returnStatus' => 'SUCCESS']);
-                    } else if ($payReturn["trade_state"] == "USERPAYING") {
-                        //用户支付中
-                        util::complete('正在付款，请稍候..');
-                    }
-                }
-                if ($payReturn["err_code"] == "ORDERNOTEXIST") {
-                    //交易订单号不存在
-                    util::complete('订单没有付款');
-                } else {
-                    util::complete('系统错误，请稍候再试');
-                }
-            } 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';
-
-                $aliPId = '2021003122664465';
-                $aliKey = 'MIIEpAIBAAKCAQEAnefrChYa5FUbGTlZNMTDNG531WrVP+TBPw3/hSmycRlBE/1sg9EryM0S3a9OQKQenRdYOoalqkkBuzt41ygJUC5hfNeaiV2OzphIiAyxUaiL1mSftP5B8joBN3HGG2AKbcvKlWcFoeiGY4ZmV/K0t3fqj/uPP6N/pEtnx6X4Ifgz4WGCDKUXKqT1Pyk2rqyIpel2EYk+HtC+9iicfac9kKQQiksDopb7sYosttdk64Dmjp2nMLDSpR+KOZUaqB39MEeHcJGeTzdVrp+Z9wW/NcJzSkSUb9juA0YjmogdbiKltykVHTbP6J0uPyByvzfyyY22QPqwNPiIPbCN6H543QIDAQABAoIBAQCO0+rOecYjSDO1siDVUTC8KTutR+/R1klRjojUWy3zjQNHYJAZ/0ZaX9wzttDSOWETeL0uWwJYL6coQxf/jVA3PWyirqYyn/R/PFFG9iwhj5HE/8lRvjXKMttM2lV2B34HaDE6yC/ZDmkYdsX1wSvjU81QJRuiVXIsGqSpep8hoVvVAn5sjvoC+zBSUaCsYy+7v7IXc6L8f/oLCBXY1r5j/+F/XFU1uFv4j162eRShQs6jQyVqQGLGCy4sSujj+8mpd6uCyJSIGJQHJlaN6cibTYStU/Z9+I/AP/+wQPVx31OwEC5J2xBfSHsezMsHSF7HQnfpQSz5AsOYZ3MOkiglAoGBAPV8sZz3C1gQ6WX5eKZE7PEUSxvAHsP+X6AAA6sWfH4cZq1uGJXgiDpTqN5dOqfNpNAU8gBDNTx4xUZ+cDuDH4WYxqkCe3CDdL97QmXDl2PnNvCKgHl735g3U1v3kCXgUAfBomc/xEIDguiEtsjPpknfjte/HmDE0zrWMOAQkJqXAoGBAKSrD5ryiVREpBmUohsI1g+e7BVR2nAtGYiquXIk2lkk5eQVO1yDh/LOU0jf8kI+UyRv16fANBjXqVc/twG016US5FNPV6fSllevsr0V020QemInO0+yJnTojSAfcayLroQId8Y3nPqVPpKMwvjvV7r50nGCCqXBtQsF4KITRzqrAoGAZBNyYNgBguRaEd1Sxw2gPmOUfvqiUCo6F4MJ+8xN8idn4FnaofcH8ic613PQPqpB/yYaxeqgIEfnvGY9ILXCuvbePfYqFmMwzALWvZ+v7uVKa2M7HstWCrq7O+m/lQFN/ut8ZnUDcBn4WwwHa/PjCYietetO2gpDRmAdSqrWGH8CgYBkwp+r6pkJzW60kHSZIlEKAe7oJMwLNC2ZqQ4MwGwzfBaH+E34kCuR8ZqYzyAIVOa/Nwi5By1Zvi1KzBwJmUUTJ3o7WCOE96EzSrmOZlqXNCwO/36Vh6dshhhE/birIlXJSP0xdzpBQy2ksyli9eGy8cdJ2Y72Wo+TjSclRbKiPQKBgQD1C/CJRQbahz6B3Sc4NOiFUQioM30qDKbDibzUq95u5PtQOx69+/h68tA2nj7ILZOXoh6/KF6LM9WK0QctY0HR5Uy4Uz8YkY/Y0L/LExSkNdpYqbpBc8DdIsKYHoMLNHDwc03tpINRLrmq00sD0907oeuY8/2l6P7XOZSnCvE5Fw==';
-                $aliPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgEb9zdQQDva63DhksZHPZCDrRe2xvZcTRy9mEiWs/pUhCG0QABkuePUyvqTAKINiCEv2QJmdF8qt3hmTSXuME5bT4vghckSGUTp4CNzsT90Vfjk4wci+bpAqNnpUASDuqZLCzebTuOhxYtGVBqYzhp/CxcC/Mag3ISjUG6jRqyUi15R1e2ruq74sohLGnb4m3nnwRVwnNVAaUcVfV1J0Nb0/9pusrj2t6FCyCkFeWbRDzKhplPQejaET2p5yplwSUpd1gqF+3srIn3erW5uAR6F0Z0NoCMzlo5TEXKWY2XMq97ubueE7Cgp8/c3dh5dkscAT2CCWwRq23aKozp+XMwIDAQAB';
-
-                $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();
+            if (isset($response['code']) && $response['code'] == 'BBS00000') {
+                if (isset($response['resp_data']['trade_state']) && $response['resp_data']['trade_state'] == 'SUCCESS') {
+                    //支付成功
+                    $transactionId = $response['resp_data']['trade_no'] ?? '';
                     $openId = '';
-                    $aliUserId = $respond->buyer_user_id ?? '';
-                    $transactionId = $respond->trade_no ?? '';
+                    $aliUserId = '';
 
                     $cg->onlinePay = dict::getDict('onlinePay', 'yes');
                     $cg->codePay = 1;
@@ -500,6 +405,15 @@ class OrderController extends BaseController
                     $order->sendType = OrderClass::SEND_TYPE_NO;
                     $order->save();
 
+                    $payWay = $cg->payWay;
+                    $account_type = $response['resp_data']['account_type'] ?? '';
+                    if ($account_type == 'WECHAT') {
+                        $payWay = dict::getDict('payWay', 'wxPay');
+                    }
+                    if ($account_type == 'ALIPAY') {
+                        $payWay = dict::getDict('payWay', 'alipay');
+                    }
+
                     $attach = '';
                     payUtil::thirdPay($payWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
                     $transaction->commit();
@@ -507,11 +421,6 @@ class OrderController extends BaseController
                     $saleId = $order->id ?? 0;
                     $order = OrderClass::getById($saleId, true);
                     if (!empty($order)) {
-                        $shopId = $order->shopId ?? 0;
-                        $shop = ShopClass::getById($shopId, true);
-                        if (!empty($shop)) {
-                            //WxMessageClass::ghsHasNewOrderInform($shop, $order);
-                        }
                         //订单生成时唤起在线打印
                         if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
                             if ($order->status != 1 && $order->status != 5) {
@@ -522,19 +431,18 @@ class OrderController extends BaseController
                         }
                         ShopExtClass::ghsGatheringReport($order);
                     }
-
                     util::success(['returnStatus' => 'SUCCESS']);
+                } else {
+                    util::complete('未知状态..');
                 }
             } else {
-                util::fail('还没有付款哦');
+                util::complete('未知状态....');
             }
-
         } catch (\Exception $e) {
             $transaction->rollBack();
-            Yii::error("支付失败原因：" . $e->getMessage());
+            noticeUtil::push('查询订单状态失败：' . $e->getMessage(), '15280215347');
             util::fail('支付失败');
         }
-
     }
 
     //微信和支付宝付款码支付 ssh 2021.4.11
@@ -572,7 +480,7 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
 
-            $subject = '购买商品';
+            $subject = '购买花材';
             $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
 
             $wxPayWay = dict::getDict('payWay', 'wxPay');
@@ -604,9 +512,8 @@ class OrderController extends BaseController
                 'authCode' => $authCode,
             ];
             $response = $laResource->scanPay($scanParams);
-            print_r($response);die;
+            if (isset($response['code']) && $response['code'] == 'BBS00000') {
 
-            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 = '';
@@ -650,25 +557,14 @@ class OrderController extends BaseController
 
                 util::success(['returnStatus' => 'SUCCESS']);
             } else {
-                Yii::info(json_encode($res));
-                $errCode = $res['err_code'] ?? '';
-                $msg = '';
-                if ($errCode == 'NOTENOUGH') {
-                    $msg = '余额不足';
-                }
-                if ($errCode == 'USERPAYING') {
-                    $msg = '等待客户输入支付密码';
-                }
+                $msg = $response['msg'] ?? '';
                 util::success(['returnStatus' => 'FAILURE'], $msg);
             }
-
-
         } catch (\Exception $e) {
             $transaction->rollBack();
             Yii::error("支付失败原因：" . $e->getMessage());
             util::fail('支付失败');
         }
-
     }
 
     //订单列表 ssh 2021.1.20

common/components/lakala/Lakala.php

@@ -33,6 +33,28 @@ class Lakala
         }
     }
 
+    public function query($params)
+    {
+        $orderSn = $params['orderSn'];
+        $ip = $this->getClientIp();
+        $location_info = ['request_ip' => $ip];
+        $arr = [
+            'merchant_no' => $this->merchant_no,
+            'term_no' => $this->term_no,
+            'out_trade_no' => $orderSn,
+            'location_info' => $location_info,
+        ];
+        $baseRequestVO = [
+            'req_data' => $arr,
+            'req_time' => date("YmdHis"),
+            'version' => $this->version,
+        ];
+        $body = json_encode($baseRequestVO, JSON_UNESCAPED_UNICODE);
+        $authorization = $this->getAuthorization($body);
+        $url = 'https://s2.lakala.com/api/v3/labs/query/tradequery';
+        return $this->post($url, $body, $authorization);
+    }
+
     //被扫付款
     public function scanPay($params)
     {