edit

journal/database/info.php

@@ -622,6 +622,20 @@ $config = array
 			),
 		),
 
+		# 更新订阅量
+		'addDing' => array
+		(
+			'type' => 'update',
+			'where' => array
+			(
+				'id' => 'yes',
+			),
+			'set' => array
+			(
+				'num_ding' => array('1', '+='),
+			),
+		),
+
 		'getIds' => array
         (
             # 匹配的正则或函数 选填项

journal/src/Api.php

@@ -14,16 +14,21 @@ class Api
 	public function ding($data)
     {
         if (isset($data['num_add_ding']) && isset($data['num_ratio_ding'])) {
-            $stat = Dever::db('stat/journal')->getNumByJournal(array('journal_id' => $data['id']));
-            if (!$stat) {
-            	$stat['buy_num'] = 0;
-            }
+            /*
+            if ($data['buy'] == 1) {
+                $stat = Dever::db('stat/journal')->getNumByJournal(array('journal_id' => $data['id']));
+                if (!$stat) {
+                    $stat['buy_num'] = 0;
+                }
 
-            if (!$stat['buy_num']) {
-            	$stat['buy_num'] = 0;
+                if (!$stat['buy_num']) {
+                    $stat['buy_num'] = 0;
+                }
+                $data['buy_num'] = $stat['buy_num'];
+                $data['num_ding'] = $stat['buy_num'];
             }
-            $data['buy_num'] = $stat['buy_num'];
-            $data['num_ding'] = $stat['buy_num'];
+            */
+            $data['buy_num'] = $data['num_ding'];
             $data['num_ding'] = round(($data['num_ding']+$data['num_add_ding'])*$data['num_ratio_ding']);
         }
 

main/lib/Journal.php

@@ -9,20 +9,15 @@ class Journal
     # 执行结束时执行的
     public function end($param)
     {
-        return;
     	# 不再执行syncone等后续操作
     	Dever::config('base')->after = 1;
-        # 用户预约
-        if (isset($param['uid']) && $param['uid'] > 0) {
-            Dever::score($param['uid'], 'read_journal', '阅读小刊');
 
-            if (isset($param['submit']) && $param['submit']) {
-	        	Dever::load('act/lib/subscribe')->submit($param['uid'], $param['id'], 4);
-	        }
-        }
+        if (isset($param['uid']) && $param['uid'] > 0 && isset($param['id']) && $param['id'] > 0 && isset($param['add_num'] && $param['add_num'])) {
 
-        if (isset($param['id']) && $param['id'] > 0) {
-        	Dever::db('journal/info')->addView($param['id']);
+            //Dever::score($param['uid'], 'read_journal', '阅读小刊');
+            Dever::load('act/lib/subscribe')->submit($param['uid'], $param['id'], 4);
+        	//Dever::db('journal/info')->addView($param['id']);
+            Dever::db('journal/info')->addDing($param['id']);
         }
     }
 }

main/src/Journal_v1.php

@@ -376,6 +376,7 @@ class Journal_v1 extends Core
 
         # 默认不能看 为1则可以直接看了，为2则不能看，要验证权限，为了高效并发，暂时去掉验证
         $subscribe = 2;
+        $add_num = false;
 
         if ($subscribe == 2) {
         	# APP专用
@@ -409,8 +410,9 @@ class Journal_v1 extends Core
 	            Dever::alert('未订阅');
 	        }
 
-            if ($this->data['info']['buy'] == 2) {
+            if ($this->data['info']['buy'] == 2 && $this->data['info']['status'] == 2) {
                 # 免费刊，增加订阅量
+                $add_num = true;
             }
         }
 
@@ -427,6 +429,10 @@ class Journal_v1 extends Core
             $this->data['content'] = array();
         }
 
+        $this->data['end']['id'] = $id;
+        $this->data['end']['uid'] = $this->data['uid'];
+        $this->data['end']['add_num'] = $add_num;
+
         return $this->data;
     }
 

stat/lib/Journal.php

@@ -84,6 +84,36 @@ class Journal
                 }
             }
         }
+
+        $sql = 'select * from wonderful_act_order where type = 3 and product_id = '.$info['id'].' and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
+        $order = Dever::db('act/order')->fetchAll($sql);
+        if ($order) {
+            
+            foreach ($order as $k => $v) {
+                $order_num++;
+                if ($v['status'] == 1) {
+                    # 待支付
+                    $order_no_num++;
+                } elseif ($v['status'] == 2) {
+                    # 已支付
+                    $order_yes_num++;
+
+                    if ($v['buy_id'] && $v['buy_id'] > 0) {
+                        $buy = Dever::db('journal/buy_num')->one($v['buy_id']);
+                        if ($buy['num']) {
+                            $buy_num += $buy['num'];
+                        }
+                    } elseif ($v['buy_num'] > 0) {
+                        $buy_num += $v['buy_num'];
+                    }
+
+                    if ($v['cash']) {
+                        $buy_cash += $v['cash'];
+                    }
+                }
+            }
+        }
+
         $this->update($info['cate_id'], $info['id'], $day, $order_num, $order_yes_num, $order_no_num, $buy_num, $buy_cash);
     }
 
@@ -113,5 +143,12 @@ class Journal
             $update['where_id'] = $id;
             Dever::db('stat/journal')->update($update);
         }
+
+        $stat = Dever::db('stat/journal')->getNumByJournal(array('journal_id' => $where['journal_id']));
+        if ($stat && $stat['buy_num']) {
+            $set['num_ding'] = $stat['buy_num'];
+            $set['where_id'] = $where['journal_id'];
+            Dever::db('journal/info')->update($set);
+        }
     }
 }

stat/lib/Source.php

@@ -88,6 +88,33 @@ class Source
             }
         }
 
+        $sql = 'select * from wonderful_act_order where type = 3 and source = '.$source['id'].' and product_id = '.$info['id'].' and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
+        $order = Dever::db('act/order')->fetchAll($sql);
+
+        if ($order) {
+            foreach ($order as $k => $v) {
+                $order_num++;
+                if ($v['status'] == 1) {
+                    # 待支付
+                    $order_no_num++;
+                } elseif ($v['status'] == 2) {
+                    # 已支付
+                    $order_yes_num++;
+
+                    if ($v['buy_id']) {
+                        $buy = Dever::db('journal/buy_num')->one($v['buy_id']);
+                        if ($buy['num']) {
+                            $buy_num += $buy['num'];
+                        }
+                    }
+
+                    if ($v['cash']) {
+                        $buy_cash += $v['cash'];
+                    }
+                }
+            }
+        }
+
         $this->update($source['id'], $info['cate_id'], $info['id'], $day, $pv, $uv, $user_num, $user_yes_num, $order_num, $order_yes_num, $order_no_num, $buy_num, $buy_cash);
     }