1

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -481,7 +482,7 @@
       <workItem from="1700699350870" duration="25020000" />
       <workItem from="1700785845814" duration="22621000" />
       <workItem from="1701045250830" duration="19896000" />
-      <workItem from="1701131684057" duration="9684000" />
+      <workItem from="1701131684057" duration="9787000" />
     </task>
     <servers />
   </component>

application/operate/controller/Activity.php

@@ -167,29 +167,29 @@ class Activity extends Controller
                 if(($before_act['start_time'] != $data['start_time'] || $before_act['end_time'] != $data['end_time']) && $before_act['address'] == $data['address'] ) {
                     \app\common\model\Activity::activityChange($data['id'],$data['title'],['end_time'=>$data['end_time'],'start_time'=>$data['start_time'],'address'=>$data['address']]);
                     //变更通知
-                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
-
-                    foreach ($all_list as $k => $v){
-                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动时间变更',$v['act_id']);
-                    }
+//                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
+//
+//                    foreach ($all_list as $k => $v){
+//                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动时间变更',$v['act_id']);
+//                    }
                 }
                 // 活动地址变更
                 else if($before_act['start_time'] == $data['start_time'] && $before_act['end_time'] == $data['end_time'] &&  $before_act['address'] != $data['address']){
                     \app\common\model\Activity::activityChange($data['id'],$data['title'],['end_time'=>$data['end_time'],'start_time'=>$data['start_time'],'address'=>$data['address']]);
                     //变更通知
-                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
-                    foreach ($all_list as $k => $v){
-                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动地址变更',$v['act_id']);
-                    }
+//                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
+//                    foreach ($all_list as $k => $v){
+//                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动地址变更',$v['act_id']);
+//                    }
                 }
                 // 活动地址与时间变更
                 else if($before_act['start_time'] != $data['start_time'] || $before_act['end_time'] != $data['end_time'] ||  $before_act['address'] != $data['address'] ) {
                     \app\common\model\Activity::activityChange($data['id'],$data['title'],['end_time'=>$data['end_time'],'start_time'=>$data['start_time'],'address'=>$data['address']]);
                     //变更通知
-                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
-                    foreach ($all_list as $k => $v){
-                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动时间地址变更',$v['act_id']);
-                    }
+//                    $all_list = ActivityApplyItem::where(['act_id'=>$data['id'],'sh_status'=>1,'is_hx'=>0])->group('phone')->select();
+//                    foreach ($all_list as $k => $v){
+//                        UserMessage::sendUserMessage($v['user_id'],'activity',2,1,0,$v['act_id'],'活动时间地址变更',$v['act_id']);
+//                    }
                 }
 
             }