From cae0c0fafee8a5a7475be9c7a194fcf8725c1c80 Mon Sep 17 00:00:00 2001
From: Gosowong <1329847115@qq.com>
Date: Fri, 19 May 2023 15:29:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=AE=A2=E5=8D=95=20=E8=99=9A=E6=8B=9F=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/jobs/MiniOrderJob.php                        | 4 ++--
 crmeb/app/listener/order/OrderShippingListener.php     | 2 +-
 crmeb/app/services/order/OtherOrderServices.php        | 2 ++
 crmeb/app/services/order/StoreOrderSuccessServices.php | 5 +++++
 crmeb/app/services/pay/PayNotifyServices.php           | 7 -------
 crmeb/app/services/user/UserRechargeServices.php       | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crmeb/app/jobs/MiniOrderJob.php b/crmeb/app/jobs/MiniOrderJob.php
index c9236b71d..f86933486 100644
--- a/crmeb/app/jobs/MiniOrderJob.php
+++ b/crmeb/app/jobs/MiniOrderJob.php
@@ -15,10 +15,10 @@ class MiniOrderJob extends BaseJobs
     /**
      * @throws HttpException
      */
-    public function doJob($shippingOrder)
+    public function doJob(string $out_trade_no, int $logistics_type, array $shipping_list, string $payer_openid, int $delivery_mode = 1, bool $is_all_delivered = true)
     {
         try {
-            MiniOrderService::shippingByTradeNo($shippingOrder['out_trade_no'], $shippingOrder['logistics_type'], $shippingOrder['shipping_list'], $shippingOrder['payer_openid'], $shippingOrder['delivery_mode'] ?? 1, $shippingOrder['is_all_delivered'] ?? true);
+            MiniOrderService::shippingByTradeNo($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered);
         } catch (HttpException $e) {
             // 订单异常处理
             throw new HttpException($e);
diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php
index dbe0594cf..d40ee08aa 100644
--- a/crmeb/app/listener/order/OrderShippingListener.php
+++ b/crmeb/app/listener/order/OrderShippingListener.php
@@ -95,7 +95,7 @@ class OrderShippingListener implements ListenerInterface
             if (empty($payer_openid)) {
                 throw new AdminException('订单支付人异常');
             }
-            MiniOrderJob::dispatch(compact($out_trade_no, $logistics_type, $shipping_list, $payer_openid, $delivery_mode, $is_all_delivered));
+            MiniOrderJob::dispatch(compact('out_trade_no', 'logistics_type', 'shipping_list', 'payer_openid', 'delivery_mode', 'is_all_delivered'));
         }
     }
 }
diff --git a/crmeb/app/services/order/OtherOrderServices.php b/crmeb/app/services/order/OtherOrderServices.php
index a188d2191..92e547b17 100644
--- a/crmeb/app/services/order/OtherOrderServices.php
+++ b/crmeb/app/services/order/OtherOrderServices.php
@@ -346,6 +346,8 @@ class OtherOrderServices extends BaseServices
             if ($spread_two && $spread_two_price > 0) $this->memberBrokerage($spread_two, $spread_two_price, 'get_two_member_brokerage', $orderInfo);
         }
 
+        // 小程序订单服务
+        event('OrderShipping', ['member', $orderInfo, 3, '', '']);
         return false !== $res;
     }
 
diff --git a/crmeb/app/services/order/StoreOrderSuccessServices.php b/crmeb/app/services/order/StoreOrderSuccessServices.php
index 6c698238b..040e9cfa4 100644
--- a/crmeb/app/services/order/StoreOrderSuccessServices.php
+++ b/crmeb/app/services/order/StoreOrderSuccessServices.php
@@ -100,6 +100,11 @@ class StoreOrderSuccessServices extends BaseServices
         event('NoticeListener', [$orderInfo, 'admin_pay_success_code']);
         // 推送订单
         event('OutPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
+
+        // 小程序订单管理 (自提商品)
+        if ($orderInfo['shipping_type'] == 2) {
+            event('OrderShipping', ['product', $orderInfo, 4, '', '']);
+        }
         $res = $res1 && $resPink;
         return false !== $res;
     }
diff --git a/crmeb/app/services/pay/PayNotifyServices.php b/crmeb/app/services/pay/PayNotifyServices.php
index 50d429b3b..b160463cb 100644
--- a/crmeb/app/services/pay/PayNotifyServices.php
+++ b/crmeb/app/services/pay/PayNotifyServices.php
@@ -39,11 +39,6 @@ class PayNotifyServices
             $orderInfo = $services->getOne(['order_id' => $order_id]);
             if (!$orderInfo) return true;
             if ($orderInfo->paid) return true;
-
-            // 小程序订单管理 (自提商品)
-            if ($orderInfo['shipping_type'] == 2) {
-                event('OrderShipping', ['product', $orderInfo]);
-            }
             return $services->paySuccess($orderInfo->toArray(), $payType, ['trade_no' => $trade_no]);
         } catch (\Exception $e) {
             return false;
@@ -80,8 +75,6 @@ class PayNotifyServices
             $orderInfo = $services->getOne(['order_id' => $order_id]);
             if (!$orderInfo) return true;
             if ($orderInfo->paid) return true;
-            // 小程序订单服务
-            event('OrderShipping', ['member', $orderInfo]);
             return $services->paySuccess($orderInfo->toArray(), $payType, ['trade_no' => $trade_no]);
         } catch (\Exception $e) {
             return false;
diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index cb7614c6d..57f4e5b33 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -491,7 +491,7 @@ class UserRechargeServices extends BaseServices
         $capitalFlowServices->setFlow($order, 'recharge');
 
         // 小程序订单服务
-        event('OrderShipping', ['recharge', $order]);
+        event('OrderShipping', ['recharge', $order, 3, '', '']);
         //提醒推送
         event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
         return true;