增加关注和被关注关系

helper/model/member_info.php

@@ -14,10 +14,17 @@ class member_info
 
     public function __construct($member_id)
     {
-        $this->member_id = $member_id;
-        $mod_member = Model('member');
-        $this->member_info = $mod_member->getMemberInfoByID($this->member_id);
+        if(is_array($member_id)) {
+            $this->member_info = $member_id;
+            $this->member_id = intval($this->member_info['member_id']);
+        }
+        else {
+            $this->member_id = $member_id;
+            $mod_member = Model('member');
+            $this->member_info = $mod_member->getMemberInfoByID($this->member_id);
+        }
     }
+
     public function member_id()
     {
         return $this->member_id;
@@ -77,4 +84,14 @@ class member_info
             return $url;
         }
     }
+
+    public function filter()
+    {
+        $info['member_id'] = $this->member_id();
+        $info['is_man'] = $this->is_man();
+        $info['nickname'] = $this->nickname();
+        $info['avatar'] = $this->avatar();
+
+        return $info;
+    }
 }

mobile/control/cart.php

@@ -161,7 +161,7 @@ class cartControl extends mobileControl
         if (!isset($_GET['page'])) {
             $page = "100";
             $curpage = "1";
-            $this->page = 100;
+            $this->page_size = 100;
         }
         initpage($page, $curpage);
 
@@ -169,7 +169,7 @@ class cartControl extends mobileControl
         $model_goods = Model('goods');
 
         $condition = array('buyer_id' => $_SESSION['member_id']);
-        $cart_list = $model_cart->getCartList($condition, $this->page);
+        $cart_list = $model_cart->getCartList($condition, $this->page_size);
         $page_count = $model_cart->gettotalpage();
         $model_cart->cls();
 //        $cart_list = $model_cart->listCart('db', $condition);

mobile/control/control.php

@@ -16,8 +16,7 @@ class mobileControl
     protected $client_type_array = array('android', 'wap', 'wechat', 'ios', 'ajax', 'web','jsonp');
 
     //列表默认分页数
-    //protected $page_size = 5;
-    protected $page = 20;
+    protected $page_size = 20;
     protected $cur_page = 1;
 
     //任务开始时间
@@ -30,19 +29,19 @@ class mobileControl
         Language::read('mobile');
         //分页数处理
         if (is_numeric($_GET['page']) && intval(trim($_GET['page'])) > 0) {
-            $this->page = intval(trim($_GET['page']));
+            $this->page_size = intval(trim($_GET['page']));
         }
         if (is_numeric($_GET['curpage']) && intval(trim($_GET['curpage'])) > 0) {
             $this->cur_page = intval(trim($_GET['curpage']));
         }
-        initpage($this->page, $this->cur_page);
+        initpage($this->page_size, $this->cur_page);
 
         $this->check_app_type();
     }
 
     protected function page_size()
     {
-        return $this->page;
+        return $this->page_size;
     }
 
     protected function page_no()

mobile/control/goods.php

@@ -213,7 +213,7 @@ class goodsControl extends mobileControl
 //          $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
 //        }
 
-        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
+        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page_size);
         $page_count = $model_goods->gettotalpage();
         $model_goods->cls();
 

mobile/control/member_chat.php

@@ -147,7 +147,7 @@ class member_chatControl extends mbMemberControl
             $list = array();
             $condition_sql = " add_time >= '" . $time_from[$key] . "' ";
             $condition_sql .= " and ((f_id = '" . $member_id . "' and t_id = '" . $t_id . "') or (f_id = '" . $t_id . "' and t_id = '" . $member_id . "'))";
-            $list = $model_chat->getLogList($condition_sql, $this->page);
+            $list = $model_chat->getLogList($condition_sql, $this->page_size);
 
             $total_page = $model_chat->gettotalpage();
             output_data(array('list' => $list), mobile_page($total_page));

mobile/control/member_favorites.php

@@ -31,7 +31,7 @@ class member_favoritesControl extends mbMemberControl
         }
 
         $model_favorites = Model('favorites');
-        $favorites_list = $model_favorites->getGoodsFavoritesList(array('member_id' => $this->member_info['member_id']), '*', $this->page);
+        $favorites_list = $model_favorites->getGoodsFavoritesList(array('member_id' => $this->member_info['member_id']), '*', $this->page_size);
         $page_count = $model_favorites->gettotalpage();
         $favorites_id = '';
         foreach ($favorites_list as $value) {

mobile/control/member_order.php

@@ -23,7 +23,7 @@ class member_orderControl extends mbMemberControl
 
     public function order_listOp()
     {
-        $this->page = 1000;
+        $this->page_size = 1000;
         $model_order = Model('order');
         $condition = array();
         $condition['buyer_id'] = $_SESSION['member_id'];
@@ -32,7 +32,7 @@ class member_orderControl extends mbMemberControl
             $condition['order_state'] = $order_state;
         }
 
-        $order_list_array = $model_order->getNormalOrderList($condition, $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
+        $order_list_array = $model_order->getNormalOrderList($condition, $this->page_size, '*', 'order_id desc', '', array('order_address', 'order_goods'));
         $order_group_list = array();
         $order_pay_sn_array = array();
 
@@ -104,7 +104,7 @@ class member_orderControl extends mbMemberControl
         $condition = array();
         $condition['buyer_id'] = $_SESSION['member_id'];
         $condition['pay_sn'] = $_POST['pay_sn'];
-        $order_list_array = $model_order->getNormalOrderList($condition, $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
+        $order_list_array = $model_order->getNormalOrderList($condition, $this->page_size, '*', 'order_id desc', '', array('order_address', 'order_goods'));
 
         $model_refund = Model('refund_return');
 

mobile/control/member_relation.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/7/21
+ * Time: 下午12:07
+ */
+require_once (BASE_ROOT_PATH . '/helper/relation_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/model_helper.php');
+
+class member_relationControl extends mbMemberControl
+{
+    public function followersOp()
+    {
+        $follower = relation_helper::follower($_SESSION['member_id']);
+
+        $desc = array();
+        $pages = 0;
+        if(!empty($follower))
+        {
+            $follower = self::separate_page($follower,$pages);
+            $members = Model('member')->getMemberList(array('member_id' => array('in',$follower)));
+
+            foreach ($members as $val) {
+                $info = new member_info($val);
+                array_push($desc,$info->filter());
+            }
+        }
+
+        return self::outsuccess(array('followers' => $follower,'mem_desc' => $desc, 'mobile_page' => mobile_page($pages)));
+    }
+
+    public function subscriberOp()
+    {
+        $follower = relation_helper::subscriber($_SESSION['member_id']);
+
+        $desc = array();
+        $pages = 0;
+        if(!empty($follower))
+        {
+            $follower = self::separate_page($follower,$pages);
+            $members = Model('member')->getMemberList(array('member_id' => array('in',$follower)));
+
+            foreach ($members as $val) {
+                $info = new member_info($val);
+                array_push($desc,$info->filter());
+            }
+        }
+
+        return self::outsuccess(array('subscriber' => $follower,'mem_desc' => $desc, 'mobile_page' => mobile_page($pages)));
+    }
+}

mobile/control/member_vr_order.php

@@ -33,7 +33,7 @@ class member_vr_orderControl extends mbMemberControl
         $model_vr_order = Model('vr_order');
         $condition = array();
         $condition['buyer_id'] = $this->member_info['member_id'];
-        $order_list = $model_vr_order->getOrderList($condition, $this->page, '*', 'order_id desc');
+        $order_list = $model_vr_order->getOrderList($condition, $this->page_size, '*', 'order_id desc');
 
         foreach ($order_list as $key => $order) {
             //显示取消订单

mobile/control/store.php

@@ -32,7 +32,7 @@ class storeControl extends mobileHomeControl
         //排序方式
         $order = $this->_goods_list_order($_GET['key'], $_GET['order']);
 
-        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page);
+        $goods_list = $model_goods->getGoodsListByColorDistinct($condition, $fieldstr, $order, $this->page_size);
         $page_count = $model_goods->gettotalpage();
 
         //处理商品列表(团购、限时折扣、商品图片)

test/funargsTest.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/7/21
+ * Time: 下午3:37
+ */
+class funargsTest extends PHPUnit_Framework_TestCase
+{
+    public function testFunargs()
+    {
+        foo("1",2,3);
+    }
+
+}
+
+
+function foo($par)
+{
+    $numargs = func_num_args();
+    echo "Number of arguments: $numargs<br />\n";
+    if ($numargs >= 2) {
+        echo "Second argument is: " . func_get_arg(1) . "<br />\n";
+    }
+
+    $arg_list = func_get_args();
+    for ($i = 0; $i < $numargs; $i++) {
+        echo "Argument $i is: " . $arg_list[$i] . "<br />\n";
+    }
+
+}

test/relation_helperTest.php

@@ -58,4 +58,22 @@ class relation_helperTest extends PHPUnit_Framework_TestCase
 
         $ret = preg_match($reg, '发送红包，红包单号: xxxxxx make_type=6', $arr);
     }
+
+
+
+    public function testFollower()
+    {
+        $follower = relation_helper::follower(36490);
+        if(!empty($follower)) {
+            //$follower = self::separate_page($follower,$pages);
+            $members = Model('member')->field('*')->where(array('member_id' => array('in',$follower)))->limit(false)->select();
+
+            $desc = array();
+            foreach ($members as $val) {
+                $info = new member_info($val);
+            }
+            //return self::outsuccess(array('followers' => $follower,'mem_desc' =>  , 'mobile_page' => mobile_page($pages)));
+        }
+
+    }
 }