gq 7 سال پیش
والد
کامیت
e98d3f73cd

+ 14 - 0
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd xqd
@@ -12,13 +12,16 @@ use App\Models\BaseAttachmentModel;
 use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
 use App\Models\DreamInfoModel;
+use App\Models\SystemInfoModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Dream\Criteria\MultiWhere;
 use App\Repositories\Dream\InfoRepository;
+use App\Helper\JpushHelper;
 
 class InfoController extends Controller
 {
+    use JpushHelper;
     private $repository;
 
     public function __construct(InfoRepository $repository) {
@@ -161,6 +164,17 @@ class InfoController extends Controller
             DreamImages::insert($arr);
         }
         $ok = $this->repository->update(request('id'),$data);
+        if ($data['status'] == 1) {   //审核通过
+            $message = '你的梦想《'.$data['name'].'》已被批准,离你实现梦想又更进一步啦~ ';
+            $info = [
+                'user_id' => $data['user_id'],
+                'message' => $message,
+            ];
+            SystemInfoModel::create($info);
+
+//            长连接
+            $this->jPush($message,'',$data['user_id']);
+        }
         if($ok) {
             $url[] = array('url'=>U( 'Dream/Info/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));

+ 17 - 2
server/app/Http/Controllers/Api/V1/DreamController.php

xqd xqd
@@ -404,6 +404,17 @@ class DreamController extends Controller
                 \QrCode::format('png')->size(500)->generate($code_url,$code_path);
                 $code =  env('APP_URL').'/qrcodes/'.$info['code'].'.png';
                 DreamInfoModel::where('id',$dream_id)->update(compact('code'));
+
+
+                $message = '你的梦想《'.$dream->name.'》已结束,点击了解接下来的步骤 ';
+                $info = [
+                    'user_id' => $dream->user_id,
+                    'message' => $message,
+                ];
+                SystemInfoModel::create($info);
+
+//            长连接
+                $this->jPush($message,'',$dream->user_id);
             }
             $data = [
                 'user_id'=>$user->id,
@@ -540,11 +551,15 @@ class DreamController extends Controller
             UserCareUser::create($array);
 //                关注成功发送私信
             $message = BaseSettingsModel::where('category','message')->first();
-            $message = empty($message) ? '' : $message->value;
-            $info2 = [
+            $message = empty($message) ? $user->nickname.'收藏了你的梦想' : $message->value;
+            /*$info2 = [
                 'user_id'=>$request->id,
                 'to_user_id' => $dream->user_id,
                 'message' =>$message
+            ];*/
+            $info2 = [
+                'user_id' => $dream->user_id,
+                'message' => $message,
             ];
             SystemInfoModel::create($info2);
             //            长连接

+ 13 - 0
server/app/Http/Controllers/Api/V1/InteractionController.php

xqd xqd
@@ -5,12 +5,15 @@ namespace App\Http\Controllers\Api\V1;
 use App\Models\CommentInfoModel;
 use App\Models\InteractionInfo;
 use App\Models\ReplyCommentsInfo;
+use App\Models\SystemInfoModel;
 use App\Models\UserCareDream;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
+use App\Helper\JpushHelper;
 
 class InteractionController extends Controller
 {
+    use JpushHelper;
     //    发布关于梦想的动态
     /**
      * @api {post} /api/interaction/store 新增动态
@@ -141,6 +144,16 @@ class InteractionController extends Controller
         $data['content'] = $request->content;
         $data['is_read'] = 1;
         $ok = CommentInfoModel::create($data);
+
+        $message = $user->nickname.'在你的互动上留言啦!点击去看看!';
+        $info = [
+            'user_id' => $data['to_user_id'],
+            'message' => $message,
+        ];
+        SystemInfoModel::create($info);
+
+//            长连接
+        $this->jPush($message,'',$data['to_user_id']);
         if ($ok) {
             return $this->api('');
         }else{

+ 14 - 0
server/app/Http/Controllers/Api/V1/MyController.php

xqd xqd
@@ -17,8 +17,11 @@ use App\Models\UserCashOut;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
+use App\Helper\JpushHelper;
+
 class MyController extends Controller
 {
+    use JpushHelper;
     /**
      * @api {get} /api/my/show 个人首页
      * @apiDescription 个人首页
@@ -498,6 +501,17 @@ class MyController extends Controller
         $data['user_id'] = $user->id;
         $data['status'] = 1;
         $ok = UserCashOut::create($data);
+
+        $message = '你提现的¥'.$data["cash"].'已经到账啦,去实现梦想吧!喵~ ';
+        $info = [
+            'user_id' => $user->id,
+            'message' => $message,
+        ];
+        SystemInfoModel::create($info);
+
+//            长连接
+        $this->jPush($message,'',$user->id);
+
         if ($ok) {
             return $this->api(ErrorCode::verify);
         }else{