Merge branch 'develop' into 'test'

Develop

See merge request bp/pay!26

application/services/pay/PayService.php

@@ -291,7 +291,8 @@ class PayService
             return true;
         }
 
-        $clearing_items = PayOrderClearingItem::select('*',
+        //注意查找需要保证pdo是一个，避免数据操作超时
+        $clearing_items = PayOrderClearingItem::selectMaster('*',
             ['order_item_id' => $order_item_id]
         );
 

application/services/pingxx/PingxxService.php

@@ -57,13 +57,13 @@ class PingxxService
             );
             //Mon 日志监控增加
             $end = microtime(true);      //计算结束时间
+            FileLog::info('pingxx-sendRefund:' . '退款订单返回', json_encode(['req'=>$refundData, 'res'=>$ret], JSON_UNESCAPED_UNICODE));
+
             $total_time = round(($end - $start),4) * 1000; //计算耗时
 
             $url = 'pingxx/v1/refund/create';
             MonUtil::proxyMon($url, '200', 'bp-pay', $total_time);
 
-            FileLog::info('pingxx-sendRefund:' . '退款订单返回', json_encode(['req'=>$refundData, 'res'=>$ret], JSON_UNESCAPED_UNICODE));
-
             $response = json_decode($ret, true);
 
         } catch (\Pingpp\Error\Base $e) {
@@ -97,12 +97,12 @@ class PingxxService
             $ret = OrderRefund::retrieve($orderId, $refundId);
 
             $end = microtime(true);      //计算结束时间
-            $total_time = round(($end - $start),4) * 1000; //计算耗时
+            FileLog::info('pingxx-getRefund:' . '退款查询返回', json_encode(['req'=>[$orderId, $refundId], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
 
+            $total_time = round(($end - $start),4) * 1000; //计算耗时
             $url = 'pingxx/v1/refund/get';
             MonUtil::proxyMon($url, '200', 'bp-pay', $total_time);
 
-            FileLog::info('pingxx-getRefund:' . '退款查询返回', json_encode(['req'=>[$orderId, $refundId], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
             $respose = json_decode($ret, true);
 
         } catch (\Pingpp\Error\Base $e) {
@@ -148,12 +148,12 @@ class PingxxService
             );
 
             $end = microtime(true);      //计算结束时间
+            FileLog::info('pingxx-createOrder:' . '创建订单返回', json_encode(['req'=>[$order, $metadata], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
+
             $total_time = round(($end - $start),4) * 1000; //计算耗时
             $url = 'pingxx/v1/order/create';
             MonUtil::proxyMon($url, '200', 'bp-pay', $total_time);
 
-            FileLog::info('pingxx-createOrder:' . '创建订单返回', json_encode(['req'=>[$order, $metadata], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
-
             $respose = json_decode($ret, true);
 
         } catch (\Pingpp\Error\Base $e) {
@@ -189,11 +189,12 @@ class PingxxService
             $ret = Order::pay($orderId, $pay);
 
             $end = microtime(true);      //计算结束时间
+            FileLog::info('pingxx-pay:' . '订单pay返回', json_encode(['req'=>[$orderId, $pay], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
+
             $total_time = round(($end - $start),4) * 1000; //计算耗时
             $url = 'pingxx/v1/order/pay';
             MonUtil::proxyMon($url, '200', 'bp-pay', $total_time);
 
-            FileLog::info('pingxx-pay:' . '订单pay返回', json_encode(['req'=>[$orderId, $pay], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
             $respose = json_decode($ret, true);
 
         } catch (\Pingpp\Error\Base $e) {
@@ -226,12 +227,12 @@ class PingxxService
             $ret = Order::retrieve($orderId);
 
             $end = microtime(true);      //计算结束时间
+            FileLog::info('pingxx-pay:' . '查询订单返回', json_encode(['req'=>[$orderId], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
+
             $total_time = round(($end - $start),4) * 1000; //计算耗时
             $url = 'pingxx/v1/order/get';
             MonUtil::proxyMon($url, '200', 'bp-pay', $total_time);
 
-            FileLog::info('pingxx-pay:' . '查询订单返回', json_encode(['req'=>[$orderId], 'res'=>$ret], JSON_UNESCAPED_UNICODE));
-
             $respose = json_decode($ret, true);
 
         } catch (\Pingpp\Error\Base $e) {