Browse Source

系统消息模块

lizhen_gitee 3 years ago
parent
commit
e7e5ed5070

+ 6 - 0
application/admin/controller/Useridconfirm.php

@@ -122,6 +122,12 @@ class Useridconfirm extends Backend
                         $this->error($task_rs['msg']);
                     }
                 }
+
+                //系统消息
+                $msg_id = \app\common\model\Message::addMessage($this->auth->id,'实名认证','实名认证已经审核通过');
+            }else{
+                //系统消息
+                $msg_id = \app\common\model\Message::addMessage($this->auth->id,'实名认证','实名认证审核不通过');
             }
             Db::commit();
 

+ 28 - 0
application/api/controller/Message.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use think\Db;
+/**
+ * 系统消息
+ */
+class Message extends Api
+{
+    protected $noNeedLogin = [];
+    protected $noNeedRight = ['*'];
+
+    //我的消息列表
+    public function mylist(){
+        $list = Db::name('message')->where('user_id',$this->auth->id)->autopage()->order('id desc')->select();
+
+        //读取即为已读
+        $map = [
+            'user_id' => $this->auth->id,
+            'status' => 0,
+        ];
+        Db::name('message')->where($map)->update(['status'=>1]);
+        $this->success('success',$list);
+    }
+
+}

+ 1 - 1
application/api/controller/Topicdongtai.php

@@ -79,7 +79,7 @@ class Topicdongtai extends Api
             'answer.level' => 1,
         ];
         $lists = Db::name('topic_dongtai_answer')->alias('answer')
-            ->field('answer.id,answer.content as answer_content,answer.createtime,user.nickname,user.avatar,dt.content as dt_content')
+            ->field('answer.id,answer.content as answer_content,answer.createtime,user.nickname,user.avatar,dt.id as dt_id,dt.content as dt_content')
             ->join('user','answer.user_id = user.id','LEFT')
             ->join('topic_dongtai dt','answer.dt_id = dt.id','LEFT')
             ->where($map)->autopage()->select();

+ 25 - 22
application/api/controller/User.php

@@ -183,32 +183,35 @@ class User extends Api
             'real_status' => 1,
         ];
         $rs = Db::name('user')->where('id',$this->auth->id)->update($data);
-
+        if($rs === false){
+            Db::rollback();
+            $this->error('认证失败');
+        }
         //tag任务赠送金币
-        if($rs){
-            //完成本人基本资料 +15金币《所有资料完善,包括真人认证和实名认证》
-            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,5);
-            if($task_rs === false){
-                Db::rollback();
-                $this->error('完成任务赠送奖励失败');
-            }
-            //完成真人头像 +5金币
-            $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,7);
-            if($task_rs === false){
+        //完成本人基本资料 +15金币《所有资料完善,包括真人认证和实名认证》
+        $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,5);
+        if($task_rs === false){
+            Db::rollback();
+            $this->error('完成任务赠送奖励失败');
+        }
+        //完成真人头像 +5金币
+        $task_rs = \app\common\model\TaskLog::tofinish($this->auth->id,7);
+        if($task_rs === false){
+            Db::rollback();
+            $this->error('完成任务赠送奖励失败');
+        }
+        //邀请人拿奖励,男性3元
+        $intro_money = $this->auth->gender == 1 ? config('site.intro_man_money') : config('site.intro_woman_money');
+        if($this->auth->idcard_status == 1 && !empty($this->auth->intro_uid) && $intro_money > 0){
+            $task_rs = model('wallet')->lockChangeAccountRemain($this->auth->intro_uid,'money',$intro_money,63,$remark='');
+            if($task_rs['status'] === false){
                 Db::rollback();
-                $this->error('完成任务赠送奖励失败');
-            }
-            //邀请人拿奖励,男性3元
-            $intro_money = $this->auth->gender == 1 ? config('site.intro_man_money') : config('site.intro_woman_money');
-            if($this->auth->idcard_status == 1 && !empty($this->auth->intro_uid) && $intro_money > 0){
-                $task_rs = model('wallet')->lockChangeAccountRemain($this->auth->intro_uid,'money',$intro_money,63,$remark='');
-                if($task_rs['status'] === false){
-                    Db::rollback();
-                    $this->error($task_rs['msg']);
-                }
+                $this->error($task_rs['msg']);
             }
-
         }
+        //系统消息
+        $msg_id = \app\common\model\Message::addMessage($this->auth->id,'真人认证','真人认证已经审核通过');
+
         Db::commit();
         $this->success();
     }

+ 2 - 0
application/common/library/Auth.php

@@ -498,6 +498,8 @@ class Auth
 
         //附上变量解锁喜欢我列表
         $userinfo['unlock_like_me'] = config('site.unlock_like_me');
+        //我的未读消息数量
+        $userinfo['unread_message_num'] = Db::name('message')->where(['user_id'=>$this->id,'status'=>0])->count('id');
 
 
         return $userinfo;

+ 2 - 2
application/common/model/Message.php

@@ -15,7 +15,6 @@ class Message extends Model
     // 定义时间戳字段名
     protected $createTime = 'createtime';
 
-
     /**
      * 添加系统消息
      */
@@ -28,7 +27,8 @@ class Message extends Model
         $data["title"] = $title;
         $data["content"] = $content;
         $data["createtime"] = time();
-        return self::insert($data);
+        $data["status"] = 0;
+        return self::insertGetId($data);
     }
 
 }