增加限购活动

helper/activity/groupbuy.php

@@ -44,6 +44,11 @@ class group_item
             $this->mParam = $param;
         }
     }
+    static private function img_url($value)
+    {
+        return $value;
+        return cthumb($value['goods_image'], 360, $value['store_id']);
+    }
 
     public function to_array()
     {
@@ -53,14 +58,13 @@ class group_item
         $info['start_time']    = intval($this->mParam['start_time']);
         $info['end_time']      = intval($this->mParam['end_time']);
         $info['goods_id']      = intval($this->mParam['goods_id']);
-        $info['promotion_price'] = $this->mParam['groupbuy_price'];
-        $info['rebate']          = $this->mParam['groupbuy_rebate'];
-        $info['quantity']        = $this->mParam['virtual_quantity'];
-        $info['upper_limit']     = $this->mParam['upper_limit'];
-        $info['buyer_count']     = $this->mParam['buyer_count'];
+        $info['promotion_price'] = floatval($this->mParam['groupbuy_price']);
+        $info['rebate']          = floatval($this->mParam['groupbuy_rebate']);
+        $info['quantity']        = intval($this->mParam['virtual_quantity']);
+        $info['upper_limit']     = intval($this->mParam['upper_limit']);
+        $info['buyer_count']     = intval($this->mParam['buyer_count']);
         $info['groupbuy_intro']  = $this->mParam['groupbuy_intro'];
-        $info['groupbuy_image'] = $this->mParam['groupbuy_image'];
-        $info['groupbuy_image1'] = $this->mParam['groupbuy_image1'];
+        $info['groupbuy_image']  = self::img_url($this->mParam['groupbuy_image']);
 
         return $info;
     }
@@ -172,7 +176,9 @@ class groupbuy
     {
         $act_id = intval($act_id);
         if(array_key_exists($act_id,$this->group_list)) {
-            return $this->group_list[$act_id];
+            $param = $this->group_list[$act_id];
+            $item = new group_item($param);
+            return $item->to_array();
         } else {
             return false;
         }

helper/activity/limitime.php

@@ -8,6 +8,38 @@
 
 namespace activity;
 
+class limit_item
+{
+    private $mParam;
+    public function __construct($param)
+    {
+        $this->mParam = null;
+        if(isset($param) && is_array($param))
+        {
+            $this->mParam = $param;
+        }
+    }
+    static private function img_url($value)
+    {
+        return $value;
+        return cthumb($value['goods_image'], 360, $value['store_id']);
+    }
+
+    public function to_array()
+    {
+        $info['xianshi_id']      = intval($this->mParam['xianshi_id']);
+        $info['xianshi_name']    = $this->mParam['xianshi_name'];
+        $info['xianshi_title']   = $this->mParam['xianshi_title'];
+        $info['xianshi_explain'] = $this->mParam['xianshi_explain'];
+        $info['start_time'] = intval($this->mParam['start_time']);
+        $info['end_time']   = intval($this->mParam['end_time']);
+        $info['lower_limit'] = intval($this->mParam['lower_limit']);
+        $info['state']       = intval($this->mParam['state']);
+
+        return $info;
+    }
+}
+
 class limitime
 {
     const XIANSHI_STATE_NORMAL = 1;
@@ -64,34 +96,28 @@ class limitime
             $this->goodsid_limit = array();
 
             $list = $mod->getXianshiList($condition);
-            foreach ($list as $val) {
+            foreach ($list as $val)
+            {
                 $xianshi_id = intval($val['xianshi_id']);
-                $this->limit_list[$xianshi_id] = $this->filter($val);
+                $this->limit_list[$xianshi_id] = $val;
                 $goods_list = Model('p_xianshi_goods')->getXianshiGoodsList(array('xianshi_id' => $xianshi_id));
                 foreach ($goods_list as $xianshi_goods) {
-                    $goods_id = intval($val['goods_id']);
+                    $goods_id = intval($xianshi_goods['goods_id']);
                     $this->goodsid_limit[$goods_id] = $xianshi_goods;
                 }
             }
         }
     }
 
-    private function filter($val)
-    {
-        if(!empty($val)) {
-            unset($val['xianshi_state_text']);
-            unset($val['editable']);
-        }
-        return $val;
-    }
-
     public function isTakepart($goods_id,&$act_id)
     {
         if(array_key_exists(intval($goods_id),$this->goodsid_limit))
         {
-            $act_id = $this->goodsid_gid[$goods_id];
-            $start  = $this->group_list[$act_id]['start_time'];
-            $end    =  $this->group_list[$act_id]['end_time'];
+            $limit = $this->goodsid_limit[$goods_id];
+
+            $start  = $limit['start_time'];
+            $end    = $limit['end_time'];
+            $act_id = intval($limit['xianshi_id']);
 
             $cur = time();
             if($cur >= intval($start) && $cur < intval($end)) {
@@ -107,6 +133,13 @@ class limitime
 
     public function get_info($act_id)
     {
-
+        if(array_key_exists($act_id,$this->limit_list)) {
+            $limit = $this->limit_list[$act_id];
+            $item = new limit_item($limit);
+            return $item->to_array();
+        }
+        else {
+            return false;
+        }
     }
 }

helper/model/goods_summary.php

@@ -39,19 +39,32 @@ class goods_summary
     public function goods_commonid() {
         return $this->goods_commonid;
     }
+
+    static private function img_url($value)
+    {
+        return $value;
+        //return cthumb($value['goods_image'], 360, $value['store_id']);
+    }
+
     public function to_array(&$act_type,&$act_id)
     {
         $summary['goods_id'] = intval($this->goods_info['goods_id']);
-        $summary['goods_name'] = $this->goods_info['goods_mobile_name'];
         $summary['goods_commonid'] = intval($this->goods_info['goods_commonid']);
+        $summary['goods_mobile_name'] = $this->goods_info['goods_mobile_name'];
+        $summary['goods_jingle'] = $this->goods_info['goods_jingle'];
         $summary['store_id'] = intval($this->goods_info['store_id']);
         $summary['brand_id'] = intval($this->goods_info['brand_id']);
         $summary['gc_id'] = intval($this->goods_info['gc_id']);
         $summary['goods_price'] = $this->goods_info['goods_price'];
         $summary['goods_marketprice'] = $this->goods_info['goods_marketprice'];
         $summary['goods_promotion_price'] = $this->goods_info['goods_promotion_price'];
+        $summary['goods_image_url'] = self::img_url($this->goods_info['goods_image']);
+
+        //begin——为兼容以前版本协议
+        $summary['goods_state'] = 1;
+        $summary['goods_storage_state'] = intval($this->goods_info['goods_storage']) > 0 ? 1 : 0;
+        //end
 
-        $summary['goods_image'] = $this->goods_info['goods_image'];
         $summary['goods_salenum'] = intval($this->goods_info['goods_salenum']);
         $summary['goods_storage'] = intval($this->goods_info['goods_storage']);
         $summary['have_gift'] = boolval($this->goods_info['have_gift']);

mobile/control/index.php

@@ -215,16 +215,33 @@ class indexControl extends mobileHomeControl
         return self::outsuccess(array('version' => $version, 'url' => $url));
     }
 
+//    public function show_goodsOp()
+//    {
+//        $goods_ids = activity_helper::recomoned_goodsids();
+//        $ret = array_chunk($goods_ids,$this->page_size());
+//        $pages = count($ret);
+//        $page_no = $pages >= $this->page_no() ? $this->page_no() : $pages;
+//        $goods_ids = $ret[$page_no - 1];
+//
+//        $helper = new goods_helper();
+//        $goods_list = $helper->get_infos($goods_ids);
+//        self::outsuccess(array('goods_list' => $goods_list, 'mobile_page' => mobile_page($pages)));
+//    }
+
     public function show_goodsOp()
     {
-        $goods_ids = activity_helper::recomoned_goodsids();
+        $goods_ids = array(4173,3844,4103,4110,4119,4120,4121);
+
         $ret = array_chunk($goods_ids,$this->page_size());
         $pages = count($ret);
         $page_no = $pages >= $this->page_no() ? $this->page_no() : $pages;
         $goods_ids = $ret[$page_no - 1];
 
         $helper = new goods_helper();
-        $goods_list = $helper->get_infos($goods_ids);
-        self::outsuccess(array('goods_list' => $goods_list, 'mobile_page' => mobile_page($pages)));
+        $ret = $helper->get_summary($goods_ids);
+        self::outsuccess(array('goods_list' => $ret['summary'],
+            'groupbuy' => $ret['groupbuy'],
+            'limitime' => $ret['limitime'],
+            'mobile_page' => mobile_page($pages)));
     }
 }

test/activity_helperTest.php

@@ -23,7 +23,9 @@ class activity_helperTest extends PHPUnit_Framework_TestCase
     public function testGift()
     {
         $helper = new goods_helper();
-        $helper->get_summary(array(4127,4217));
+//        $helper->get_summary(array(1269,4127,4217));
+        $helper->get_summary(array(1269));
+
     }
 
     public function testGroupbuy()