Browse Source

模板消息发送

whj 4 năm trước cách đây
mục cha
commit
d704b933d8

+ 1 - 1
app/Http/Controllers/Admin/ProjectController.php

xqd
@@ -158,7 +158,7 @@ class ProjectController extends BaseController
     public function change(Request $request)
     {
         $this->model->where('id', $request->input('id'))->update(['active' => $request->input('active')]);
-//        Notification::sendProjectInfo($request->input('id'));
+        Notification::sendProjectInfo($request->input('id'));
         return response()->json(['status' => 'success', 'info' => '操作成功']);
     }
 

+ 6 - 1
app/Http/Controllers/Api/mini/DataController.php

xqd
@@ -129,7 +129,12 @@ class DataController extends BaseController
         $type = $request->input('type') ? $request->input('type') : 'year';
         $cnt = 0;
         $projects = Project::whereIn('id', $this->project_ids)->where('id','!=',1)->get();
-
+        if(empty($orders->toArray())){
+            foreach ($projects as $p){
+                $values[] = 0;
+                $names[] = $p->name;
+            }
+        }
         foreach($orders as $item) {
             if($this->inDate($names, $item->created_at, $type)) {
                 foreach ($projects as $key => $project) {

+ 1 - 0
app/Http/Controllers/Api/mini/ProjectController.php

xqd
@@ -103,6 +103,7 @@ class ProjectController extends BaseController
             return $this->success(['data' => $items]);
         }
         $items = $this->model;
+        $items = $items->where('id','!=',1);
         if($request->input('user_id') && $request->input('type' ) != 'edit' ) {
             $project_ids = ProjectUser::where('user_id', $request->input('user_id'))->pluck('project_id');
             if(count($project_ids) > 0) $items = $items->whereNotIn('id', $project_ids);

+ 51 - 42
app/Models/Notification.php

xqd xqd xqd
@@ -139,17 +139,20 @@ class Notification extends BaseModel
     {
         $content = $this->getNameContent();
         $user = User::find($this['user_id']);
-        $official_app = app('wechat.official_account.default');
-        if($content && isset($content['official']) && $user && $user['official_open_id']) {
+        $official_app = app('wechat.mini_program.default');
+        if($content && isset($content['official']) && $user && $user['open_id']) {
             $info = $content['official'];
-            $official_app->template_message->send([
-                'touser' => $user['official_open_id'],
-                'template_id' => $info['template_id'],
-                'miniprogram' => [
-                    'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
-                    'pagepath' => $info['page'],
-                ],
-                'data' => $info['data'],
+            $res = $official_app->uniform_message->send([
+                'touser' => $user['open_id'],
+                'mp_template_msg' => [
+                    'appid'=>env('WECHAT_OFFICIAL_ACCOUNT_APPID'),
+                    'template_id' => $info['template_id'],
+                    'miniprogram' => [
+                        'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
+                        'pagepath' => $info['page'],
+                    ],
+                    'data' => $info['data'],
+                ]
             ]);
         }
     }
@@ -164,25 +167,28 @@ class Notification extends BaseModel
         if($project && isset($project['user_id'])) {
             $user = User::find($project['user_id']);
             if($user) {
-                $official_app = app('wechat.official_account.default');
+                $official_app = app('wechat.mini_program.default');
                 $title = $project->active == 1 ? '您申请的项目已经通过审批,请及时查看!' : '您申请的项目未通过申请,请重新提交!';
-                $official_app->template_message->send([
-                    'touser' => $user['official_open_id'],
-                    'template_id' => 'NusdON_pl0l32P6rFeYOlvE-53QYvu_eRnn5LthaVdM',
-                    'miniprogram' => [
-                        'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
-                        'pagepath' => 'pages/index/index',
-                    ],
-                    'data' => [
-                        'first' => $title,
-                        'keyword1' => $project->name,
-                        'keyword2' => $user->name,
-                        'keyword3' => '中铁二局',
-                        'keyword4' => '',
-                        'keyword5' => $project->created_at,
-                        'remark' => '点击进入小程序查看详情',
-                    ],
-                ]);
+                $official_app->uniform_message->send([
+                    'touser' => $user['open_id'],
+                    'mp_template_msg' => [
+                        'appid'=>env('WECHAT_OFFICIAL_ACCOUNT_APPID'),
+                        'template_id' => 'NusdON_pl0l32P6rFeYOlvE-53QYvu_eRnn5LthaVdM',
+                        'miniprogram' => [
+                            'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
+                            'pagepath' => 'pages/index/index',
+                        ],
+                        'data' => [
+                            'first' => $title,
+                            'keyword1' => $project->name,
+                            'keyword2' => $user->name,
+                            'keyword3' => '中铁二局',
+                            'keyword4' => '',
+                            'keyword5' => $project->created_at,
+                            'remark' => '点击进入小程序查看详情',
+                        ],
+                    ]
+            ]);
             }
         }
     }
@@ -200,22 +206,25 @@ class Notification extends BaseModel
             $role = ProjectRole::find($project_user['project_role_id']);
             $work_point = WorkPoint::find($project['work_point_id']);
             if($user) {
-                $official_app = app('wechat.official_account.default');
+                $official_app = app('wechat.mini_program.default');
                 $title = '你的项目授权审批已通过!';
                 $remark = '授权角色:' . $project->name . ' - ' . ($work_point ? $work_point->name : '') . ' - ' . ($role ? $role->name : '');
-                $official_app->template_message->send([
-                    'touser' => $user['official_open_id'],
-                    'template_id' => 'zzNETW2GEZ4_GfVp020yH8n9VL97G9EttONAtcrxG9c',
-                    'miniprogram' => [
-                        'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
-                        'pagepath' => 'pages/index/index',
-                    ],
-                    'data' => [
-                        'first' => $title,
-                        'keyword1' => $user->name,
-                        'keyword2' => $project_user->created_at,
-                        'remark' => $remark,
-                    ],
+                $official_app->uniform_message->send([
+                    'touser' => $user['open_id'],
+                    'mp_template_msg' => [
+                        'appid'=>env('WECHAT_OFFICIAL_ACCOUNT_APPID'),
+                        'template_id' => 'zzNETW2GEZ4_GfVp020yH8n9VL97G9EttONAtcrxG9c',
+                        'miniprogram' => [
+                            'appid' => env('WECHAT_MINI_PROGRAM_APPID'),
+                            'pagepath' => 'pages/index/index',
+                        ],
+                        'data' => [
+                            'first' => $title,
+                            'keyword1' => $user->name,
+                            'keyword2' => $project_user->created_at,
+                            'remark' => $remark,
+                        ],
+                    ]
                 ]);
             }
         }

+ 1 - 1
app/Models/Project.php

xqd
@@ -113,7 +113,7 @@ class Project extends BaseModel
 
     public static function getOptions()
     {
-        return self::where('id', '>', 0)->get()->toArray();
+        return self::where('id', '>', 1)->get()->toArray();
     }
     public static function getNotOneProjectOptions(){
         return self::where('id','!=',1)->get();