wupengfei 2 years ago
parent
commit
70d80c842e

+ 4 - 2
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <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/common/model/UserCollect.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserCollect.php" 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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/PlatformLike.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/PlatformLike.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -198,7 +200,7 @@
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
       <workItem from="1670287594399" duration="11535000" />
-      <workItem from="1670461023846" duration="17675000" />
+      <workItem from="1670461023846" duration="18365000" />
     </task>
     <servers />
   </component>

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

@@ -183,6 +183,7 @@ class Activity extends Base
         $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']);
+        $detail['transmit_num'] = numTransform($detail['transmit_num']);
         $detail['ladder_arr'] = $detail['ladder'] ? json_decode($detail['ladder']): null;
         if(!$detail['user_id']){
             $detail['app_name']  = sysconf('app_name');

+ 18 - 2
application/api/controller/Article.php

@@ -137,6 +137,7 @@ class Article extends Base
         $sql = "SELECT $field FROM " .$table . " a LEFT JOIN ( SELECT id,IF(id,1,1) is_recommend FROM $table b WHERE ( $where_str )) AS c ON c.id = a.id LEFT JOIN dd_article_intro as k ON k.id = a.article_id  WHERE a.is_deleted = 0 AND a.status =1 AND k.status = 1 AND k.is_deleted = 0 ORDER BY is_recommend DESC , $order_by_two desc LIMIT {$this->off_set},{$this->page_num}";
         $list = Db::query($sql);
         array_walk($list,function (&$v,$k)use ($app_name,$app_logo){
+            $v['read_num'] = numTransform($v['read_num']);
             if(!$v['user_id']){
                 $v['app_name']  = $app_name;
                 $v['app_logo']  = $app_logo;
@@ -231,10 +232,12 @@ class Article extends Base
         $app_name = sysconf('app_name');
         $app_logo = sysconf('app_logo');
         array_walk($list,function (&$v,$k)use ($app_name,$app_logo){
-           // $v['read_num']=  array_sum(array_column($v['item_list'],'read_num'));
+            $v['read_num']=  array_sum(array_column($v['item_list'],'read_num'));
+            $v['read_num'] = numTransform($v['read_num']);
             unset($v['content']);
             foreach ($v['item_list'] as &$iv) {
                 unset($iv['content']);
+                $iv['read_num'] = numTransform($iv['read_num']);
                 if(!$iv['user_id']){
                     $iv['app_name']  = $app_name;
                     $iv['app_logo']  = $app_logo;
@@ -287,13 +290,17 @@ class Article extends Base
         $detail = ArticleIntro::where($sel_where)->with('itemList')->find()->toArray();
         if($detail['is_deleted'] == 1 || $detail['status'] == 0)$this->error('该图文已下线');
         if($form == 'H5') $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
+        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
+        $detail['read_num'] = numTransform($detail['read_num']);
         foreach ($detail['item_list'] as &$dv) {
             if($form == 'H5') $dv['content'] = openssl_encrypt($dv['content'],'DES-ECB',123456,0);
             $dv['comment_num']  = ArticleComment::where(['article_id'=>$detail['id'],'item_id'=>$dv['id']])->count();
+            $dv['comment_num']  = numTransform($detail['comment_num']);
             $dv['collect_num']  = UserCollect::where(['coll_type'=>3,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
+            $dv['comment_num']  = numTransform($detail['collect_num']);
             $dv['is_collect']  = UserCollect::checkCollectByType($this->user_id,3,$detail['id'],$dv['id']);
+            $dv['read_num']  = numTransform($dv['read_num']);
         }
-        $detail['read_num']  = array_sum(array_column($detail['item_list'],'read_num'));
         $this->success('ok',['detail'=>$detail]);
     }
 
@@ -336,6 +343,11 @@ class Article extends Base
         $detail['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$detail['article_id'],'item_id'=>$detail['id']])->count();
         if($form == 'H5') $detail['content'] = openssl_encrypt($detail['content'],'DES-ECB',123456,0);
         $detail['like_num'] = ArticleLike::where(['article_id'=>$detail['article_id'],'item_id'=>$detail['id']])->count();
+        $detail['like_num'] = numTransform($detail['like_num']);
+        $detail['read_num'] = numTransform($detail['read_num']);
+        $detail['comment_num'] = numTransform($detail['comment_num']);
+        $detail['collect_num'] = numTransform($detail['collect_num']);
+        $detail['transmit_num'] = numTransform($detail['transmit_num']);
         UserTrack::crateTrack($this->user_id,3,$detail['article_id'],$item_id);
         //var_dump($this->user_id,3,$detail['article_id'],$item_id);
         $this->success('ok',['detail'=>$detail]);
@@ -400,6 +412,7 @@ class Article extends Base
                 ->select()->toArray();
             $val['children'] =  $children;
             $val['like_num'] = ArticleCommentLike::where('like_id',$val['id'])->count();
+            $val['like_num'] = numTransform($val['like_num']);
             $val['is_like'] =  ArticleCommentLike::where(['like_id'=>$val['id'],'user_id'=>$user_id])->count();
             $parent  = ArticleComment::where(['c.id'=>$val['pid'],'c.is_deleted'=>0])
                 ->alias('c')->field('c.*,u.name,u.headimg')
@@ -828,6 +841,7 @@ class Article extends Base
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){
+            $v['read_num'] = numTransform($v['read_num']);
             $v['is_normal'] = CheckPower::checkModulesPower($v['article_id'],$v['item_id'],$this->request->controller());
         });
         $this->success('ok',['list'=>$list]);
@@ -1111,6 +1125,8 @@ class Article extends Base
             ->select()->toArray();
         foreach ($list as &$v) {
             $v['like_num'] = ArticleLike::where(['article_id'=>$v['article_id'],'item_id'=>$v['item_id']])->count();
+            $v['like_num'] = numTransform($v['like_num']);
+            $v['read_num'] = numTransform($v['read_num']);
             $v['is_like'] = ArticleLike::where(['user_id'=>$this->user_id,'article_id'=>$v['article_id'],'item_id'=>$v['item_id']])->count();
             $v['images_arr'] = $v['images'] ? explode('|',$v['images']):null;
             $v['is_normal'] = CheckPower::checkModulesPower($v['article_id'],$v['item_id'],$this->request->controller());

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

@@ -50,7 +50,8 @@ class PlatformLike extends Model
     // 点赞数量
     public static function getPraiseNum($id,$type)
     {
-        return self::where(['like_id'=>$id,'type'=>$type])->count() ;
+        $num = self::where(['like_id'=>$id,'type'=>$type])->count() ;
+        return  numTransform($num);
     }
 
 }