up 通知 125

app/adminapi/logic/property/PropertyOrderLogic.php

@@ -199,20 +199,6 @@ class PropertyOrderLogic extends BaseLogic
             }
 
             Db::commit();
-
-            $workDetail = ServiceWork::findOrEmpty($order['work_id']);
-            if (!$workDetail->isEmpty()) {
-                event('Notice', [
-                    'scene_id' => 125,
-                    'params' => [
-                        'user_id' => 0,
-                        'order_id' => $workDetail['id'],
-                        'thing2' => $propertyHeadInfo['village_name'],
-                        'thing8' => $propertyUserInfo['householder_name'],
-                        'phone_number11' => $propertyUserInfo['householder_mobile'],
-                    ]
-                ]);
-            }
             return true;
         } catch (\Exception $e) {
             Db::rollback();

app/api/logic/PropertyOrderLogic.php

@@ -15,6 +15,7 @@
 namespace app\api\logic;
 
 
+use app\adminapi\logic\property\PropertyHeadLogic;
 use app\adminapi\logic\property\PropertyUserLogic;
 use app\common\model\property\PropertyHead;
 use app\common\model\property\PropertyOrder;
@@ -53,6 +54,17 @@ class PropertyOrderLogic extends BaseLogic
                 'address' => $address??'',
             ]);
             Db::commit();
+            $propertyHeadInfo =  PropertyHeadLogic::detail(['id'=>$params['property_head_id']]);
+            $propertyUserInfo = PropertyUserLogic::detail(['id'=>$propertyUserId]);
+            event('Notice', [
+                'scene_id' => 125,
+                'params' => [
+                    'user_id' => 0,
+                    'thing2' => $propertyHeadInfo['village_name'],
+                    'thing8' => $propertyUserInfo['householder_name'],
+                    'phone_number11' => $propertyUserInfo['householder_mobile'],
+                ]
+            ]);
             return true;
         } catch (\Exception $e) {
             Db::rollback();