订单回调-现金支付回调走新的订单成功方法

app/controller/api/Notify.php

@@ -127,85 +127,87 @@ class Notify
                             }
                             break;
                         case 'pay':
-                            $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
-                            $uid = $group_order['uid'];
-                            if (in_array($uid, [1592, 766, 6, 783, 7, 1166, 4604, 4782])) {
-                                /** ************** 定义参数 ************** */
-                                // 订单编号
-                                $groupOrderSn_Rand = $post_data_str['order_no'];
-                                // 订单号
-                                $groupOrderSn = $requestId[0];
-                                // 随机值
-                                $rand = $requestId[1];
-                                // 支付人ID
-                                $payOpenId = $post_data_str['expend']['open_id'];
-                                // 支付撤销方法
-                                $paymentReverseFunc = function ($payWX, $payType, $groupOrderSn_Rand, $paymentId, $appId, $orderNo, $reverseAmt, $notifyUrl = '') {
-                                    if ($payWX == StoreGroupOrderEnum::PAY_WX['TDYL']['code']) {
-                                        $key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
-                                    } else {
-                                        $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
-                                    }
-                                    $refundTraits = [
-                                        'payment_id' => $paymentId,
-                                        'app_id' => $appId,
-                                        'order_no' => $orderNo,
-                                        'reverse_amt' => $reverseAmt,
-                                        'notify_url' => $notifyUrl ?: env('APP_URL') . "/api/hf_notify/reverse_order",
-                                    ];
-                                    $hfRefundRes = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refundTraits, $payType == '1' ? 2 : 1, $payWX, $key);
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【03】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；汇付支付撤销请求参数：' . json_encode($refundTraits) . '；汇付支付撤销返回结果：' . json_encode($hfRefundRes)
-                                        ]);
-                                };
-                                /** *************** 定义结束 *************** */
-
-                                /** 逻辑开始 */
-                                // 1、获取订单数据
-                                /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
-                                $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
-                                // 获取订单组数据
-                                $storeGroupOrderEntity = $storeGroupOrderRepository->getStoreGroupOrderEntityByGroupOrderSn($groupOrderSn);
-                                if (empty($storeGroupOrderEntity->getGroupOrderId())) {
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【01】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单组查询失败'
-                                        ]);
-                                    break;
-                                }
-                                /** @var StoreOrderRepository $storeOrderRepository */
-                                $storeOrderRepository = app()->make(StoreOrderRepository::class);
-                                // 获取订单集合
-                                $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
-                                if (empty($storeOrderEntityList)) {
-                                    Db::name("log")
-                                        ->insert([
-                                            'data' => '【订单支付回调】【02】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单集合查询失败'
-                                        ]);
-                                    break;
+                            /** ************** 定义参数 ************** */
+                            // 订单编号
+                            $groupOrderSn_Rand = $post_data_str['order_no'];
+                            // 订单号
+                            $groupOrderSn = $requestId[0];
+                            // 随机值
+                            $rand = $requestId[1];
+                            // 支付人ID
+                            $payOpenId = $post_data_str['expend']['open_id'];
+                            // 支付撤销方法
+                            $paymentReverseFunc = function ($payWX, $payType, $groupOrderSn_Rand, $paymentId, $appId, $orderNo, $reverseAmt, $notifyUrl = '') {
+                                if ($payWX == StoreGroupOrderEnum::PAY_WX['TDYL']['code']) {
+                                    $key = 'api_live_b0a687ec-5450-4ada-a0e4-65bac0f46871';
+                                } else {
+                                    $key = 'api_live_90ef02e4-54ac-41ee-adf1-e4927d23d58f';
                                 }
+                                $refundTraits = [
+                                    'payment_id' => $paymentId,
+                                    'app_id' => $appId,
+                                    'order_no' => $orderNo,
+                                    'reverse_amt' => $reverseAmt,
+                                    'notify_url' => $notifyUrl ?: env('APP_URL') . "/api/hf_notify/reverse_order",
+                                ];
+                                $hfRefundRes = app()->make(StoreRefundOrderRepository::class)->payment_Reverse($refundTraits, $payType == '1' ? 2 : 1, $payWX, $key);
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【03】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；汇付支付撤销请求参数：' . json_encode($refundTraits) . '；汇付支付撤销返回结果：' . json_encode($hfRefundRes)
+                                    ]);
+                            };
+                            /** *************** 定义结束 *************** */
+
+                            /** 逻辑开始 */
+                            // 1、获取订单数据
+                            /** @var StoreGroupOrderRepository $storeGroupOrderRepository */
+                            $storeGroupOrderRepository = app()->make(StoreGroupOrderRepository::class);
+                            // 获取订单组数据
+                            $storeGroupOrderEntity = $storeGroupOrderRepository->getStoreGroupOrderEntityByGroupOrderSn($groupOrderSn);
+                            if (empty($storeGroupOrderEntity->getGroupOrderId())) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【01】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单组查询失败'
+                                    ]);
+                                break;
+                            }
+                            /** @var StoreOrderRepository $storeOrderRepository */
+                            $storeOrderRepository = app()->make(StoreOrderRepository::class);
+                            // 获取订单集合
+                            $storeOrderEntityList = $storeOrderRepository->getStoreOrderEntityListByGroupOrderId($storeGroupOrderEntity->getGroupOrderId());
+                            if (empty($storeOrderEntityList)) {
+                                Db::name("log")
+                                    ->insert([
+                                        'data' => '【订单支付回调】【02】:时间：' . date('Y-m-d H:i:s', time()) . '；订单编号：' . $groupOrderSn_Rand . '；订单集合查询失败'
+                                    ]);
+                                break;
+                            }
 
-                                // 2、判断订单是否已经被代付 如果已记录支付人 并且不是自己，则可能有人代付，则将本次的支付撤回
-                                foreach ($storeOrderEntityList as $storeOrderEntity) {
-                                    if (!empty($storeOrderEntity->getPayOpenId())) {
-                                        if ($storeOrderEntity->getPayOpenId() != $payOpenId) {
-                                            // 如果已经被用户支付 撤回支付
-                                            $orderNo = app()->make(StoreRefundOrderRepository::class)->getNewOrderId();
-                                            $paymentReverseFunc($storeGroupOrderEntity->getPayWx(), $pay_type, $groupOrderSn_Rand, $post_data_str['id'], $post['app_id'], $orderNo, $post_data_str['pay_amt']);
-                                            break 2;
-                                        }
-                                    } else {
-                                        $storeOrderEntity->setPayOpenId($payOpenId);
+                            // 2、判断订单是否已经被代付 如果已记录支付人 并且不是自己，则可能有人代付，则将本次的支付撤回
+                            foreach ($storeOrderEntityList as $storeOrderEntity) {
+                                if (!empty($storeOrderEntity->getPayOpenId())) {
+                                    if ($storeOrderEntity->getPayOpenId() != $payOpenId) {
+                                        // 如果已经被用户支付 撤回支付
+                                        $orderNo = app()->make(StoreRefundOrderRepository::class)->getNewOrderId();
+                                        $paymentReverseFunc($storeGroupOrderEntity->getPayWx(), $pay_type, $groupOrderSn_Rand, $post_data_str['id'], $post['app_id'], $orderNo, $post_data_str['pay_amt']);
+                                        break 2;
                                     }
+                                } else {
+                                    $storeOrderEntity->setPayOpenId($payOpenId);
                                 }
-                                // 如果已支付 不做后续处理
-                                if ($storeGroupOrderEntity->getPaid() == StoreGroupOrderEnum::PAID['YES']['code']) {
-                                    break;
-                                }
+                            }
+                            // 如果已支付 不做后续处理
+                            if ($storeGroupOrderEntity->getPaid() == StoreGroupOrderEnum::PAID['YES']['code']) {
+                                break;
+                            }
+
+                            // 3、支付成功 处理逻辑
+                            $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
+                            /*
+                            $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
+                            $uid = $group_order['uid'];
+                            if (in_array($uid, [1592, 766, 6, 783, 7, 1166, 4604, 4782])) {
 
-                                // 3、支付成功 处理逻辑
-                                $storeGroupOrderRepository->storeGroupOrderPaySuccess($storeGroupOrderEntity->getGroupOrderId());
                             } else {
                             // 判断代付是否支付过
                             $group_order = Db::name('store_group_order')->where('group_order_sn', $requestId[0])->find();
@@ -965,6 +967,7 @@ class Notify
                             event('pay_success_order', ['order_sn' => $requestId[0],'pay_type'=>$pay_type]);
 
                             }
+                            */
                             break;
                         case 'pay_channel':
                             //渠道商