wupengfei 2 年之前
父节点
当前提交
5208c07013

+ 7 - 4
.idea/workspace.xml

@@ -2,9 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/application/common/model/ActivityApply.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Activity.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/ActivityApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/ActivityApply.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/PlatformLike.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/PlatformLike.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/UserCollect.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserCollect.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -205,7 +208,7 @@
       <workItem from="1662597494801" duration="19368000" />
       <workItem from="1662684804331" duration="11139000" />
       <workItem from="1663029337583" duration="7661000" />
-      <workItem from="1663115672199" duration="7509000" />
+      <workItem from="1663115672199" duration="9019000" />
     </task>
     <servers />
   </component>
@@ -221,10 +224,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1175" y="519" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1659079177590" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1663134947324">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1663137101431">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1663134947324" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1663137101431" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1663123360148">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 75 - 0
application/api/controller/Activity.php

@@ -1,6 +1,10 @@
 <?php
 
 namespace app\api\controller;
+use app\common\model\ActivityApply;
+use app\common\model\PlatformLike;
+use app\common\model\UserCollect;
+
 /**
  * @title 活动
  * @controller Activity
@@ -39,6 +43,7 @@ class Activity extends Base
      * @return name:price type:float default:-- desc:价格
      * @return name:label type:string default:-- desc:标签[多个','隔开]
      * @return name:label_name type:array default:-- desc:标签[数组]
+     * @return name:is_apply type:int default:0 desc:是否报名【0否1是】
      */
     public function getActivityList(){
         $title = input('get.title');
@@ -53,6 +58,7 @@ class Activity extends Base
         foreach ($list as &$v) {
             $v['cover_arr'] = $v['cover'] ? explode('|',$v['cover']) : null;
             $v['label_name'] = explode(',',trim($v['label'],','));
+            $v['is_apply'] = ActivityApply::checkApply($this->user_id,$v['id']);
         }
         $this->success('ok',['list'=>$list]);
     }
@@ -76,6 +82,12 @@ class Activity extends Base
      * @return name:price type:float default:-- desc:价格
      * @return name:label type:string default:-- desc:标签[多个','隔开]
      * @return name:label_name type:array default:-- desc:标签[数组]
+     * @return name:is_apply type:int default:0 desc:是否报名【0否1是】
+     * @return name:praise_num type:int default:-- desc:点赞量
+     * @return name:is_praise type:int default:-- desc:是否点赞【0否1是】
+     * @return name:is_collect type:int default:-- desc:是否收藏【0否1是】
+     * @return name:collect_num type:int default:-- desc:收藏量
+     * @return name:transmit_num type:int default:-- desc:转发量
      */
     public function getActivityDetail()
     {
@@ -83,9 +95,72 @@ class Activity extends Base
         $detail = \app\common\model\Activity::where($sel_where)->find()->toArray();
         $detail['cover_arr'] = $detail['cover'] ? explode('|',$detail['cover']) : null;
         $detail['label_name'] = explode(',',trim($detail['label'],','));
+        $detail['is_apply'] = ActivityApply::checkApply($this->user_id,$detail['id']);
+        $detail['is_praise'] = PlatformLike::checkTags($this->user_id,$detail['id'],4);
+        $detail['praise_num'] = PlatformLike::getPraiseNum($detail['id'],4);
+        $detail['is_collect'] = UserCollect::checkCollectByType($this->user_id,7,$detail['id']);
+        $detail['collect_num'] = UserCollect::getCollectNum(7,$detail['id']);
         $this->success('ok',['detail'=>$detail]);
     }
 
+    /**
+     * @title 以下接口调用验证登录【需要header传Authorization】
+     * @desc 以下接口调用验证登录
+     * @author qc
+     * @method
+     * @url /api/Activity/needLogin()
+     */
+    public function needLogin(){}
+
+
+    /**
+     * @title 点赞||取消点赞
+     * @desc 点赞||取消点赞
+     * @author qc
+     * @method POST
+     * @url /api/Activity/activityTags
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int default:1 desc:活动id
+     * @return name:tags type:int default:1 desc:0取消成功,1点赞成功
+     */
+    public function activityTags()
+    {
+        $ret_val = PlatformLike::userTags($this->user_id,input('post.id'),4);
+        $this->success($ret_val == 1 ?'点赞成功':'取消成功',['tags'=>$ret_val]);
+    }
+
+    /**
+     * @title 收藏||取消收藏
+     * @desc 用户收藏
+     * @author qc
+     * @method POST
+     * @url /api/Activity/activityCollect
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int require:1 default:-- desc:活动id
+     * @param name:status type:int default:0 desc:收藏状态(0取消收藏【未收藏】,1收藏)
+     */
+    public function activityCollect(){
+        $coll_status = UserCollect::plateCollect($this->user_id,7,input('post.id',0));
+        $coll_status ?  $this->success('收藏成功',['status'=>1]) :    $this->success('取消收藏成功',['status'=>0]);
+    }
+
+
+    /**
+     * @title 新闻转发(转发数量统计)
+     * @desc 转发成功后调用
+     * @author qc
+     * @method POST
+     * @url /api/Activity/activityTransmit
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:int default:-- desc:活动id
+     */
+    public function activityTransmit()
+    {
+        $activity_id = input('post.id',0);
+        \app\common\model\Activity::where('id',$activity_id)->setInc('transmit_num');
+        $this->success('ok');
+    }
+
 
 
 

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

@@ -174,7 +174,7 @@ class Press extends Base
     
     /**
      * @title 以下接口调用验证登录【需要header传Authorization】
-     * @desc 转发成功后调用
+     * @desc 以下接口调用验证登录
      * @author qc
      * @method
      * @url /api/Press/needLogin()

+ 13 - 0
application/common/model/ActivityApply.php

@@ -4,6 +4,19 @@ use think\Model;
 // 活动报名明细
 class ActivityApply extends Model
 {
+    // 验证会员是否报名某个活动
+    public static function checkApply($user_id,$act_id)
+    {
+        $id = static::where(['user_id'=>$user_id,'act_id'=>$act_id,'is_deleted'=>0,'status'=>1])->count('id');
+        return $id ? 1: 0;
+    }
+
+    // 获取报名详情
+    public static function getApplyInfo($user_id,$act_id)
+    {
+        $detail = static::where(['user_id'=>$user_id,'act_id'=>$act_id,'is_deleted'=>0,'status'=>1])->find();
+        return $detail ? $detail->toArray() : null;
+    }
 
 
 }

+ 1 - 0
application/common/model/PlatformLike.php

@@ -10,6 +10,7 @@ class PlatformLike extends Model
         1=>'新闻点赞',
         2=>'新闻评论点赞',
         3=>'论坛回答',
+        4=>'活动',
     ];
     /**
      *  验证是否点赞

+ 1 - 1
application/common/model/UserCollect.php

@@ -30,7 +30,7 @@ class UserCollect extends Model
 
     /**
      * @param $user_id
-     * @param $type 1平台视频,2资料,3图文4新闻5论坛6商品
+     * @param $type 1平台视频,2资料,3图文4新闻5论坛6商品7活动
      * @param $id
      * @param int $children_id
      * @return int