From 5873ed6ccdcd1bb11636f64044976ec7d0bab922 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 11 Aug 2023 15:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=B6=E8=B4=A7=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php      | 6 ++++--
 app/listener/paySuccessOrder.php                           | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 398fbf6f..81fa826f 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -193,6 +193,7 @@ class StoreOrderRepository extends BaseRepository
     public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [])
     {
         $groupOrder->append(['user']);
+        Log::info("=============1");
         //修改订单状态
         Db::transaction(function () use ($subOrders, $is_combine, $groupOrder) {
             $time = date('Y-m-d H:i:s');
@@ -442,13 +443,14 @@ class StoreOrderRepository extends BaseRepository
             } catch (Exception $e) {
             }
         }
-
+        Log::info("=============2");
         Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_PAY_SUCCESS', 'id' => $groupOrder->group_order_id]);
         Queue::push(SendSmsJob::class, ['tempId' => 'ADMIN_PAY_SUCCESS_CODE', 'id' => $groupOrder->group_order_id]);
         Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_money', 'inc' => $groupOrder->pay_price]);
         Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
         app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id);
         event('order.paySuccess', compact('groupOrder'));
+        Log::info("=============3");
         //店内扫码支付
         if (isset($groupOrder['micro_pay']) && $groupOrder['micro_pay'] == 1) {
             $order = $this->dao->search(['uid' => $groupOrder->uid])->where('group_order_id', $groupOrder->group_order_id)->find();
@@ -462,7 +464,7 @@ class StoreOrderRepository extends BaseRepository
             });
             event('order.take', compact('order'));
         }
-
+        Log::info("=============4");
     }
 
     /**
diff --git a/app/listener/paySuccessOrder.php b/app/listener/paySuccessOrder.php
index 0efe335f..a11d2b11 100644
--- a/app/listener/paySuccessOrder.php
+++ b/app/listener/paySuccessOrder.php
@@ -9,7 +9,7 @@ use app\common\model\system\merchant\Merchant;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\system\merchant\FinancialRecordRepository;
 use app\common\repositories\system\merchant\MerchantRepository;
-use app\common\model\user\User;
+use app\common\model\store\order\StoreOrder;
 use crmeb\services\SmsService;
 use crmeb\utils\DingTalk;
 use think\facade\Db;
@@ -28,6 +28,7 @@ class paySuccessOrder
 
     public function handle($event)
     {
+        Log::info("============= handle监听");
         $this->event = $event;
         $this->finance = [];
         $this->index = 1;
@@ -152,8 +153,8 @@ class paySuccessOrder
             'logistics_code' => $code
         ]);
         if ($res) {
-            //发生短信
-            $phone = User::where('uid', $uid)->value('phone');
+            //收货人短信
+            $phone = StoreOrder::where('order_id', $orderId)->value('user_phone');
             if ($phone) {
                 Log::info("发送短信 {$phone}, orderId: {$orderId}");
                 SmsService::create()->send($phone, 'TAKEGOOD_CODE', ['number' => substr($orderSn, -6), 'number2' => $code, 'phone' => $logisticsPhone]);