收款通知性能优化

app/controller/PayController.php

@@ -155,15 +155,17 @@ class PayController
             return \json(\backMsg(1, '更新失败'));
         }
     }
-    // 处理收款通知
-    public function payHeart($pid = '', $aid = '', $sign = '')
+    public function payHeart(Request $request)
     {
+        $pid = $request->get('pid');
+        $aid = $request->get('aid');
+        $sign = $request->get('sign');
         // 检测请求参数
         if (!($pid && $aid && $sign)) {
-            return '参数错误';
+            return json(['code' => 0, 'msg' => '参数错误']);
         }
         // 检测收款通知
-        $payList = request()->post();
+        $payList = $request->post();
         if (!$payList) {
             return json(['code' => 0, 'msg' => '空收款通知']);
         }
@@ -174,43 +176,48 @@ class PayController
         }
         // 当前用户账号
         $query = ['pid' => $pid, 'aid' => $aid];
-        // 排除有效期内的已支付订单
+        // 排除已支付订单
         $doneOrders = Order::scope('dealOrder')->where($query)->column('platform_order');
-        if ($doneOrders) {
-            $num = count($payList['order_no']);
-            for ($i = 0; $i < $num; $i++) {
-                if (in_array($payList['order_no'][$i], $doneOrders)) {
-                    $payList['price'][$i] = 0;
-                }
-            }
-        }
-        if (array_sum($payList['price']) === 0) {
-            return json(['code' => 0, 'msg' => '查询无新订单']);
+        $new_orders = [];
+        foreach ($payList as $order) {
+            if (!in_array($order['order_no'], $doneOrders)) $new_orders[] = $order;
         }
+        if (!count($new_orders)) return json(['code' => 0, 'msg' => '查询无新订单']);
         // 有效订单列表
         $activeOrders = Order::scope('activeOrder')->where($query)->select();
-        if (!\count($activeOrders)) {
-            return json(['code' => 0, 'msg' => '无有效期订单']);
-        }
-        // $msg = []; 订单高并发预留
+        if (!count($activeOrders)) return json(['code' => 0, 'msg' => '数据库无有效期订单']);
+        // 查找所有支付渠道
+        $channels = $activeOrders->column('cid');
+        $cids = PayChannel::whereIn('id', $channels)->column('channel', 'id');
+        // 订单处理
+        $notify = [];
+        foreach ($new_orders as $new_order) {
             foreach ($activeOrders as $order) {
-            $index = array_search($order->really_price, $payList['price']);
-            // 付款金额检查
-            if ($index !== false) {
-                // 已支付订单容错查询
-                $is_order_no = Order::where('platform_order', $payList['order_no'][$index])->where($query)->find();
                 // 支付方式核对
-                $is_payway = $order->type === $payList['payway'][$index];
+                $is_payway = $order->type === $new_order['payway'];
                 // 支付渠道核对
-                $is_channel = PayChannel::where('id', $order->cid)->value('channel') === $payList['channel'][$index];
-                // 全部核对通过，修改订单状态
-                if (!$is_order_no && $is_payway && $is_channel) {
-                    // 支付成功
-                    $set_order_state = $order->save(['state' => 1, 'pay_time' => date('Y-m-d H:i:s', time()), 'platform_order' => $payList['order_no'][$index]]);
-                    // 订单成交通知
-                    if (!$set_order_state) {
-                        return json(['code' => 0, 'msg' => '修改订单状态失败']);
+                $is_channel = $cids[$order->cid] === $new_order['channel'];
+                // 金额核对
+                $is_money = $order->money === $new_order['price'];
+                // 订单核对
+                if ($is_payway && $is_channel && $is_money) {
+                    $res = $this->updateOrderState($order, $new_order['order_no']);
+                    $notify[] = $res;
                 }
+            }
+        }
+        if (!$notify) $notify = ['code' => 0, 'msg' => '收款通知无匹配订单'];
+        return json($notify);
+    }
+    // 修改订单状态并通知
+    private function updateOrderState(Order $order, string $order_no = ''): array
+    {
+        // 支付成功
+        $set_order_state = $order->save(['state' => 1, 'pay_time' => date('Y-m-d H:i:s', time()), 'platform_order' => $order_no]);
+        if (!$set_order_state) {
+            return ['order' => $order->order_id, 'code' => 0, 'msg' => '修改订单状态失败'];
+        }
+        // 订单成交通知
         $notify = self::crateNotify($order);
         // 字符串签名
         $user_key = User::where('pid', $order->pid)->value('secret_key');
@@ -219,12 +226,9 @@ class PayController
         // 异步通知
         $res_notify = self::getHttpResponse($order->notify_url . '?' . http_build_query($notify));
         if ($res_notify === 'success') {
-                        return json(['code' => 0, 'msg' => 'success']);
+            return ['order' => $order->order_id, 'code' => 1, 'msg' => 'notify success'];
         } else {
-                        return json(['code' => 1, 'msg' => '异步通知失败']);
-                    }
-                }
-            }
+            return ['order' => $order->order_id, 'code' => 0, 'msg' => 'notify fail'];
         }
     }
     // [定时任务]获取收款明细，提交收款通知[本地版]
@@ -258,9 +262,7 @@ class PayController
         $res_new_order = $Mpay->orderHeart();
         $new_order = json_decode($res_new_order, true);
         // 检测新订单
-        if ($new_order['code'] !== 1) {
-            return $res_new_order;
-        }
+        if ($new_order['code'] !== 1) return $res_new_order;
         // 订单列表
         $order_list = $new_order['orders'];
         // 检测本账号订单

app/model/Order.php

@@ -176,7 +176,7 @@ class Order extends BaseModel
     // 查询有效期内的成交订单
     public function scopeDealOrder($query)
     {
-        $query->where('close_time', '>', self::getFormatTime())->where('state', 1);
+        $query->where('close_time', '>', self::getFormatTime(time() - self::$activity_time))->where('state', 1);
     }
     // 查询超时过期订单
     public function scopeTimeoutOrder($query)

extend/MpayClass.php

@@ -26,7 +26,7 @@ class MpayClass
     public function upRecords($records, $aid)
     {
         $header = ['Content-Type: application/json;charset=UTF-8'];
-        $url = $this->submit_records_url . "/{$this->pid}/{$aid}/{$this->getSign()}";
+        $url = $this->submit_records_url . "?pid={$this->pid}&aid={$aid}&sign={$this->getSign()}";
         $res = $this->getHttpResponse($url, $header, json_encode($records));
         return $res;
     }

extend/payclient/ShouQianBa.php

@@ -95,10 +95,10 @@ class ShouQianBa
     {
         $new_query = $query;
         $now = $this->now;
-        $begin_time = (int)(($now - 175) . mt_rand(100, 999));
-        $end_time = (int)($now . mt_rand(100, 999));
-        $query['date_start'] = $begin_time;
-        $query['date_end'] = $end_time;
+        $begin_time = (int)(($now - 175) . 000);
+        $end_time = (int)($now . 999);
+        $new_query['date_start'] = $begin_time;
+        $new_query['date_end'] = $end_time;
         return $new_query;
     }
     // 登陆账号

route/app.php

@@ -13,7 +13,7 @@ Route::rule('getOrderState/[:order_id]', 'Pay/getOrderState');
 // 监控新订单
 Route::rule('checkOrder/[:pid]/[:sign]', 'Pay/checkOrder');
 // 处理收款通知
-Route::rule('payHeart/[:pid]/[:aid]/[:sign]', 'Pay/payHeart');
+Route::rule('payHeart', 'Pay/payHeart');
 // 监听收款通知
 Route::rule('checkPayResult', 'Pay/checkPayResult');
 // 验证支付结果

runtime/order.json

@@ -1 +1 @@
-{"code":1,"msg":"\u67091\u4e2a\u65b0\u8ba2\u5355","orders":[{"id":36315,"pid":1001,"aid":7,"cid":7,"patt":1}]}
+{"code":0,"msg":"没有新订单"}