支付方式

app-ghs/controllers/OrderController.php

@@ -735,14 +735,13 @@ class OrderController extends BaseController
         }
     }
 
-    //微信和支付宝付款码支付验证（带付款码） ssh 20260716
+    //微信和支付宝付款码支付复查 ssh 20260716
     public function actionCodePayVerify()
     {
         ini_set('date.timezone', 'Asia/Shanghai');
         header("Content-type: text/html; charset=utf-8");
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $authCode = isset($get['authCode']) ? $get['authCode'] : '';
 
         util::checkRepeatCommit($id, 3);
 
@@ -787,7 +786,7 @@ class OrderController extends BaseController
                 'lklCertificatePath' => $lklCertificatePath,
             ];
             $laResource = new Lakala($params);
-            $scanParams = ['orderSn' => $orderSn, 'authCode' => $authCode];
+            $scanParams = ['orderSn' => $orderSn,];
             $response = $laResource->query($scanParams);
 
             if (isset($response['code']) && $response['code'] == 'BBS00000') {
@@ -859,10 +858,10 @@ class OrderController extends BaseController
                     }
                     util::success(['returnStatus' => 'SUCCESS']);
                 } else {
-                    util::complete('未知状态..');
+                    util::success(['returnStatus' => 'PENDING'], '等待支付中...');
                 }
             } else {
-                util::complete('未知状态....');
+                util::success(['returnStatus' => 'PENDING'], '等待支付中...');
             }
         } catch (\Exception $e) {
             $transaction->rollBack();
@@ -870,7 +869,6 @@ class OrderController extends BaseController
             util::fail('支付失败');
         }
     }
-
     /**
      * 微信和支付宝付款码支付
      * 职责：处理商户扫描客户付款码（被扫支付）的请求，调用拉卡拉支付接口并更新本地订单状态

app-hd/controllers/OrderController.php

@@ -433,14 +433,13 @@ class OrderController extends BaseController
         }
     }
 
-    //微信和支付宝付款码支付验证（带付款码） ssh 20260716
+    //微信和支付宝付款码支付复查 ssh 20260716
     public function actionCodePayVerify()
     {
         ini_set('date.timezone', 'Asia/Shanghai');
         header("Content-type: text/html; charset=utf-8");
         $get = Yii::$app->request->get();
         $id = isset($get['id']) ? $get['id'] : 0;
-        $authCode = isset($get['authCode']) ? $get['authCode'] : '';
 
         util::checkRepeatCommit($id, 3);
 
@@ -476,7 +475,7 @@ class OrderController extends BaseController
                 'lklCertificatePath' => $lklCertificatePath,
             ];
             $laResource = new Lakala($params);
-            $scanParams = ['orderSn' => $orderSn, 'authCode' => $authCode];
+            $scanParams = ['orderSn' => $orderSn,];
             $response = $laResource->query($scanParams);
 
             if (isset($response['code']) && $response['code'] == 'BBS00000') {
@@ -524,16 +523,15 @@ class OrderController extends BaseController
 
                     util::success(['returnStatus' => 'SUCCESS']);
                 } else {
-                    util::complete('未知状态..');
+                    util::success(['returnStatus' => 'PENDING'], '等待支付中...');
                 }
             }
-            util::complete('未知状态..');
+            util::success(['returnStatus' => 'PENDING'], '等待支付中...');
         } catch (\Exception $e) {
             $transaction->rollBack();
             util::complete('支付失败');
         }
     }
-
     /**
      * 微信和支付宝付款码支付
      * 职责：处理商户扫描客户付款码（被扫支付）的请求，调用拉卡拉支付接口并更新本地订单状态（零售端）