From 8c99d97ae54adefefed95dbf2bc07b7c7b498f7b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 29 Dec 2023 16:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9F=AD=E4=BF=A1=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderRepository.php        |  2 +-
 .../store/order/StoreOtherOrderRepository.php   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 598d2002..1b0e1e3a 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -473,7 +473,7 @@ class StoreOrderRepository extends BaseRepository
                 if($group_value){
                     foreach($group_value as $k=>$v){
                         $phone=json_decode($v,true);
-                        Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_CREATE', 'phone' => $phone['phone'],'orderId'=>$order->order_id]);//短信通知
+                        Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_CREATE', 'phone' => $phone['phone'],'orderId'=>$order->order_id,'id'=>0]);//短信通知
                     }
                 }
 
diff --git a/app/common/repositories/store/order/StoreOtherOrderRepository.php b/app/common/repositories/store/order/StoreOtherOrderRepository.php
index 8bee8844..102ce344 100644
--- a/app/common/repositories/store/order/StoreOtherOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php
@@ -319,6 +319,23 @@ class StoreOtherOrderRepository extends BaseRepository
                         'id' => $order->order_id
                     ]
                 ], $order->mer_id);
+
+                $group_id=0;
+                if($order->activity_type==98){
+                    $group_id=Db::name('system_group')->where('group_key','city_operations')->value('group_id');
+                }else{
+                    $group_id=Db::name('system_group')->where('group_key','town_operation')->value('group_id');
+                }
+                if($group_id){
+                    $group_value=Db::name('system_group_data')->where('group_id',$group_id)->column('value');
+                    if($group_value){
+                        foreach($group_value as $k=>$v){
+                            $phone=json_decode($v,true);
+                            Queue::push(SendSmsJob::class, ['tempId' => 'ORDER_CREATE', 'phone' => $phone['phone'],'orderId'=>$order->order_id,'id'=>0]);//短信通知
+                        }
+                    }
+    
+                }
             }
 
             $this->giveIntegral($groupOrder);