add: 规范变量使用

application/services/pay/PayService.php

@@ -39,8 +39,8 @@ class PayService
             throw new PayException(['cus' => 1]);
         }
 
-        $order = $data['result']['order_info'];
-        if ($order['user_id'] != $user_id) {
+        $order_info = $data['result']['order_info'];
+        if ($order_info['user_id'] != $user_id) {
             throw new PayException(['cus' => 1]);
         }
 
@@ -58,14 +58,14 @@ class PayService
         $max_expire_time = config('pay','pay.expire_time') ?? 1800;
         $expire_time = time() + $max_expire_time;
         $pay_order_id = $this->gen_pay_order_id($user_id);
-        $pay_order = [
+        $new_pay_order = [
             'pay_order_id' => $pay_order_id,
-            'user_id' => $order['user_id'],
-            'life_account_id' => $order['life_account_id'],
-            'shop_id' => $order['shop_id'],
-            'order_id' => $order['order_id'],
+            'user_id' => $order_info['user_id'],
+            'life_account_id' => $order_info['life_account_id'],
+            'shop_id' => $order_info['shop_id'],
+            'order_id' => $order_info['order_id'],
             'pay_order_status' => Dictionary::O_PAY_STATUS_UNPAY,
-            'pay_amount' => $order['payment'],
+            'pay_amount' => $order_info['payment'],
             'third_order_id' => '',
             'expire_time' => date('Y-m-d H:i:s', $expire_time),
             'source_name' => 10,
@@ -74,17 +74,17 @@ class PayService
         ];
 
         //获取或创建支付订单
-        $order = PayOrder::get_valid_order($order_id, $pay_order);
-        if (empty($order)) {
+        $pay_order = PayOrder::get_valid_order($order_id, $new_pay_order);
+        if (empty($pay_order)) {
             throw new PayException(['cus' => 0]);
         }
 
-        if ($order['pay_order_status'] == Dictionary::O_PAY_STATUS_PAYED) {
+        if ($pay_order['pay_order_status'] == Dictionary::O_PAY_STATUS_PAYED) {
             throw new PayException(['cus' => 3]);
         }
 
         // 支持幂等，存在有效订单需要可以重复支付
-        $ret = PingxxService::getInstance()->createOrder($order, $metadata);
+        $ret = PingxxService::getInstance()->createOrder($pay_order, $metadata);
         if (!empty($ret['error'])) {
             throw new \Exception($ret['error']['message'], '2001');
         }
@@ -94,14 +94,14 @@ class PayService
                 'pay_order_status' => Dictionary::O_PAY_STATUS_PAYED,
                 'third_order_id' => $ret['id'],
             ];
-            PayOrder::update($edit, ['pay_order_id' => $order['pay_order_id']]);
+            PayOrder::update($edit, ['pay_order_id' => $pay_order['pay_order_id']]);
             throw new PayException(['cus' => 3]);
 
         } elseif ($ret["status"] == 'canceled') {
             $edit = [
                 'expire_time' => date('Y-m-d H:i:s'),
             ];
-            PayOrder::update($edit, ['pay_order_id' => $order['pay_order_id']]);
+            PayOrder::update($edit, ['pay_order_id' => $pay_order['pay_order_id']]);
             throw new PayException(['cus' => 11]);
 
         } elseif ($ret["status"] == 'created') {
@@ -109,21 +109,21 @@ class PayService
                 'pay_order_status' => Dictionary::O_PAY_STATUS_WAIT,
                 'third_order_id' => $ret['id'],
             ];
-            PayOrder::update($edit, ['pay_order_id' => $order['pay_order_id']]);
+            PayOrder::update($edit, ['pay_order_id' => $pay_order['pay_order_id']]);
 
         } else {
             throw new PayException(['cus' => 0]);
         }
 
         //存在一个继续支付单订单
-        if($pay_order_id != $order['pay_order_id']) {
+        if($pay_order_id != $pay_order['pay_order_id']) {
             $ret['exist'] = true;
         }
 
         // 创建支付单
         $payment = [
-            'charge_order_no'=> $order['pay_order_id'],
-            'charge_amount'=> $order['payment'],
+            'charge_order_no'=> $pay_order['pay_order_id'],
+            'charge_amount'=> $pay_order['pay_amount'],
             'channel'=> 'wx',
         ];