wupengfei 2 years ago
parent
commit
c29d35174b
3 changed files with 17 additions and 8 deletions
  1. 3 2
      .idea/workspace.xml
  2. 12 5
      application/api/controller/Datum.php
  3. 2 1
      application/api/controller/Forum.php

+ 3 - 2
.idea/workspace.xml

@@ -3,7 +3,8 @@
   <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/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -198,7 +199,7 @@
       <workItem from="1669952538953" duration="9708000" />
       <workItem from="1670201125142" duration="9015000" />
       <workItem from="1670287594399" duration="11535000" />
-      <workItem from="1670461023846" duration="18524000" />
+      <workItem from="1670461023846" duration="19636000" />
     </task>
     <servers />
   </component>

+ 12 - 5
application/api/controller/Datum.php

@@ -116,7 +116,8 @@ class Datum 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_datum_intro as k ON k.id = a.datum_id WHERE a.status = 1 AND a.is_deleted = 0 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){
-
+            $v['down_num'] = numTransform($v['down_num']);
+            $v['read_num'] = numTransform($v['read_num']);
         });
         $this->success('ok',['list'=>$list,'sql'=>$sql]);
     }
@@ -192,6 +193,7 @@ class Datum extends Base
         array_walk($list,function (&$v,$k){
             $v['is_collect'] = UserCollect::checkCollectByType($this->user_id,2,$v['id']);
             $v['down_num']  = array_sum(array_column($v['url_arr'],'down_num'));
+            $v['down_num'] = numTransform($v['down_num']);
         });
         $this->success('ok',['list'=>$list]);
     }
@@ -223,14 +225,15 @@ class Datum extends Base
         $detail = DatumIntro::where($sel_where)->with('urlArr')->find()->toArray();
         if($detail['is_deleted'] == 1 || $detail['status'] == 0)$this->error('该资料已下线');
         $level_id = UserLevelRank::getUserVip($this->user_id);
+        $detail['read_num']  = numTransform(array_sum(array_column($detail['url_arr'],'read_num')));
+        $detail['down_num']  = numTransform(array_sum(array_column($detail['url_arr'],'down_num')));
         foreach ($detail['url_arr'] as &$dv) {
             if($dv['is_vip'] && !$level_id) $dv['url'] = '';
             $dv['is_collect'] = UserCollect::checkCollectByType($this->user_id,2,$detail['id'],$dv['id']);
             $dv['collect_num'] = UserCollect::where(['user_id'=>$this->user_id,'coll_type'=>1,'coll_id'=>$detail['id'],'children_id'=>$dv['id']])->count();
+            $dv['collect_num'] = numTransform($dv['collect_num']);
+            $dv['down_num'] = numTransform($dv['down_num']);
         }
-
-        $detail['read_num']  = array_sum(array_column($detail['url_arr'],'read_num'));
-        $detail['down_num']  = array_sum(array_column($detail['url_arr'],'down_num'));
         $this->success('ok',['detail'=>$detail]);
     }
 
@@ -260,7 +263,11 @@ class Datum extends Base
         $detail = DatumUrl::where('id',$url_id)->find()->toArray();
         if($detail['is_deleted'] == 1 || $detail['status'] == 0) $this->error('该资料已下架');
         $detail['collect_num']  = UserCollect::where(['coll_type'=>2,'coll_id'=>$detail['datum_id'],'children_id'=>$detail['id']])->count();
-        $detail['is_collect']  = UserCollect::checkCollectByType($this->user_id,2,$detail['datum_id'],$detail['id']);
+        $detail['is_collect']   = UserCollect::checkCollectByType($this->user_id,2,$detail['datum_id'],$detail['id']);
+        $detail['collect_num']  = numTransform($detail['collect_num']);
+        $detail['down_num']     = numTransform($detail['down_num']);
+        $detail['read_num']     = numTransform($detail['read_num']);
+        $detail['transmit_num'] = numTransform($detail['transmit_num']);
         UserTrack::crateTrack($this->user_id,2,$detail['datum_id'],$url_id);
         $this->success('ok',['detail'=>$detail]);
     }

+ 2 - 1
application/api/controller/Forum.php

@@ -116,7 +116,8 @@ class Forum extends Base
             array_walk($list,function (&$v,$k) use ($app_name,$app_logo){
                 $v['label_name'] = $v['label'] ?  explode(',',trim($v['label'],',')): null;
                 $reply_num =  ForumReply::field('count(DISTINCT user_id) reply_num' )->where(['forum_id'=>$v['id']])->select()->toArray();
-                $v['reply_num'] = array_sum(array_column($reply_num,'reply_num'));
+                $v['reply_num'] = numTransform(array_sum(array_column($reply_num,'reply_num')));
+                $v['browse_num'] = numTransform($v['browse_num']);
                 if(!$v['name'])$v['name'] = $app_name;
                 if(!$v['headimg'])$v['headimg'] = $app_logo;
             });