shish пре 2 година
родитељ
комит
cc1e6e371e
2 измењених фајлова са 109 додато и 181 уклоњено
  1. 76 181
      app-ghs/controllers/OrderController.php
  2. 33 0
      common/components/lakala/Lakala.php

+ 76 - 181
app-ghs/controllers/OrderController.php

@@ -560,13 +560,7 @@ class OrderController extends BaseController
         if (empty($authCode)) {
             util::fail('支付失败');
         }
-        $wxPrefix = ['10', '11', '12', '13', '14', '15'];
-        $isWx = false;
-        foreach ($wxPrefix as $wxId) {
-            if (strpos($authCode, $wxId) === 0) {
-                $isWx = true;
-            }
-        }
+
         $deadline = $cg->deadline;
         $current = date("Y-m-d H:i:s");
         if ((strtotime($deadline) + 20) < strtotime($current)) {
@@ -578,196 +572,97 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
 
-            $outTradeNo = $orderSn;
             $subject = '购买商品';
-            $totalAmount = $totalFee;
-            $body = "门店";
             $capitalType = dict::getDict('capitalType', 'xhPurchase', 'id');
 
-            if ($isWx) {
-
-                $wxPayWay = dict::getDict('payWay', 'wxPay');
-                $order->payWay = $wxPayWay;
-                $order->save();
-                $cg->payWay = $wxPayWay;
-                $cg->save();
-
-                $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);
-
-                //获取微信商户号等信息
-                $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'] ?? '';
-                    $aliUserId = '';
+            $wxPayWay = dict::getDict('payWay', 'wxPay');
+            $order->payWay = $wxPayWay;
+            $order->save();
+            $cg->payWay = $wxPayWay;
+            $cg->save();
 
-                    $cg->onlinePay = dict::getDict('onlinePay', 'yes');
-                    $cg->codePay = 1;
-                    $cg->payOpenId = $openId;
-                    $cg->aliUserId = $aliUserId;
-                    //自取订单
-                    $cg->getType = PurchaseClass::GET_TYPE_SELF_GET;
-                    $cg->save();
+            $shop = $this->shop;
 
-                    $order->onlinePay = dict::getDict('onlinePay', 'yes');
-                    $order->codePay = 1;
-                    //自取订单
-                    $order->sendType = OrderClass::SEND_TYPE_NO;
-                    $order->save();
+            $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);
+            $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
+            $scanParams = [
+                'orderSn' => $orderSn,
+                'amount' => $totalFee,
+                'capitalType' => $capitalType,
+                'notifyUrl' => $notifyUrl,
+                'subject' => $subject,
+                'authCode' => $authCode,
+            ];
+            $response = $laResource->scanPay($scanParams);
+            print_r($response);die;
+
+            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 = '';
+
+                $cg->onlinePay = dict::getDict('onlinePay', 'yes');
+                $cg->codePay = 1;
+                $cg->payOpenId = $openId;
+                $cg->aliUserId = $aliUserId;
+                //自取订单
+                $cg->getType = PurchaseClass::GET_TYPE_SELF_GET;
+                $cg->save();
 
-                    $attach = '';
-                    payUtil::thirdPay($wxPayWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
-                    $transaction->commit();
+                $order->onlinePay = dict::getDict('onlinePay', 'yes');
+                $order->codePay = 1;
+                //自取订单
+                $order->sendType = OrderClass::SEND_TYPE_NO;
+                $order->save();
 
-                    $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);
-                    }
+                $attach = '';
+                payUtil::thirdPay($wxPayWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
+                $transaction->commit();
 
-                    util::success(['returnStatus' => 'SUCCESS']);
-                } else {
-                    Yii::info(json_encode($res));
-                    $errCode = $res['err_code'] ?? '';
-                    $msg = '';
-                    if ($errCode == 'NOTENOUGH') {
-                        $msg = '余额不足';
+                $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 ($errCode == 'USERPAYING') {
-                        $msg = '等待客户输入支付密码';
+                    //订单生成时唤起在线打印
+                    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();
+                        }
                     }
-                    util::success(['returnStatus' => 'FAILURE'], $msg);
+                    ShopExtClass::ghsGatheringReport($order);
                 }
 
+                util::success(['returnStatus' => 'SUCCESS']);
             } 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');
-
-//            $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"
-                );
-
-                // 支付超时,线下扫码交易定义为5分钟
-                $timeExpress = "5m";
-
-                // 创建请求builder,设置请求参数
-                $barPayRequestBuilder = new \AlipayTradePayContentBuilder();
-                $barPayRequestBuilder->setOutTradeNo($outTradeNo);
-                $barPayRequestBuilder->setTotalAmount($totalAmount);
-                $barPayRequestBuilder->setAuthCode($authCode);
-                $barPayRequestBuilder->setTimeExpress($timeExpress);
-                $barPayRequestBuilder->setSubject($subject);
-                $barPayRequestBuilder->setBody($body);
-
-                // 调用barPay方法获取当面付应答
-                $barPay = new \AlipayTradeService($config);
-                $barPayResult = $barPay->barPay($barPayRequestBuilder);
-
-                if ($barPayResult->getTradeStatus() == 'SUCCESS') {
-                    $respond = $barPayResult->getResponse();
-                    $openId = '';
-                    $aliUserId = $respond->buyer_user_id ?? '';
-                    $transactionId = $respond->trade_no ?? '';
-
-                    $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($aliPayWay, $capitalType, $orderSn, $totalFee, $attach, $transactionId);
-                    $transaction->commit();
-
-                    $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);
-                    }
-
-                    util::success(['returnStatus' => 'SUCCESS']);
+                Yii::info(json_encode($res));
+                $errCode = $res['err_code'] ?? '';
+                $msg = '';
+                if ($errCode == 'NOTENOUGH') {
+                    $msg = '余额不足';
                 }
-                util::success(['returnStatus' => 'FAILURE']);
+                if ($errCode == 'USERPAYING') {
+                    $msg = '等待客户输入支付密码';
+                }
+                util::success(['returnStatus' => 'FAILURE'], $msg);
             }
 
+
         } catch (\Exception $e) {
             $transaction->rollBack();
             Yii::error("支付失败原因:" . $e->getMessage());

+ 33 - 0
common/components/lakala/Lakala.php

@@ -33,6 +33,39 @@ class Lakala
         }
     }
 
+    //被扫付款
+    public function scanPay($params)
+    {
+        $orderSn = $params['orderSn'];
+        $amount = $params['amount'];
+        $notifyUrl = $params['notifyUrl'];
+        $subject = $params['subject'];
+        $authCode = $params['authCode'];
+        $capitalType = $params['capitalType'];
+        $ip = $this->getClientIp();
+        $location_info = ['request_ip' => $ip];
+        $arr = [
+            'merchant_no' => $this->merchant_no,
+            'term_no' => $this->term_no,
+            'out_trade_no' => $orderSn,
+            'total_amount' => $amount * 100,
+            'auth_code' => $authCode,
+            'location_info' => $location_info,
+            'subject' => $subject,
+            'notify_url' => $notifyUrl,
+            'remark' => '{"capitalType":' . $capitalType . '}',
+        ];
+        $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/trans/micropay';
+        return $this->post($url, $body, $authorization);
+    }
+
     //关掉 ssh 20231009
     public function close($params)
     {