stanley-king hace 9 años
padre
commit
3f6f5cf3be
Se han modificado 4 ficheros con 31 adiciones y 59 borrados
  1. 2 2
      core/framework/libraries/log.php
  2. 11 0
      helper/field_helper.php
  3. 17 57
      helper/goods_helper.php
  4. 1 0
      mobile/control/index.php

+ 2 - 2
core/framework/libraries/log.php

@@ -6,7 +6,7 @@ defined('InShopNC') or exit('Access Invalid!');
 
 class Log
 {
-    const open_sql = true;
+    const open_sql = false;
     const SQL = 1;
     const INFO = 2;
     const DEBUG = 3;
@@ -17,7 +17,7 @@ class Log
 
     static $moduls = array("default","session");
 
-    const cur_level = self::INFO;
+    const cur_level = self::ERR;
 
     private static $log = array();
     private static $stsql_log = array();

+ 11 - 0
helper/field_helper.php

@@ -8,6 +8,17 @@
 
 class field_helper
 {
+    public static function unset_column(&$arr,$fields)
+    {
+        $keys = explode(',',$fields);
+        foreach($arr as $key => $val)
+        {
+            if(in_array($key,$keys)) {
+                unset($arr[$key]);
+            }
+        }
+    }
+
     public static function validate_null_string(&$datas,$fields,$def_val='')
     {
         $keys = explode(',',$fields);

+ 17 - 57
helper/goods_helper.php

@@ -5,6 +5,7 @@
  * Date: 16/3/30
  * Time: 下午3:31
  */
+require_once (BASE_ROOT_PATH . '/helper/field_helper.php');
 
 class goods_helper
 {
@@ -24,18 +25,10 @@ class goods_helper
      */
     private function goods_list_extend($goods_list)
     {
-        $commonid_array = array();
-        $goodsid_array = array();
-        foreach ($goods_list as $key => $value) {
-            $commonid_array[] = $value['goods_commonid'];
-            $goodsid_array[] = $value['goods_id'];
-
-            // image 切换为goods_common 表中数据
-            $condition['goods_commonid'] = $value['goods_commonid'];
-            $goods_image = Model()->table('goods_common')->where($condition)->field('goods_image')->select();
-            $goods_list[$key]['goods_image'] = $goods_image[0]['goods_image'];
-        }
+        if(empty($goods_list)) return $goods_list;
 
+        $commonid_array = array_column($goods_list,'goods_commonid');
+        $goodsid_array = array_column($goods_list,'goods_commonid');
         //促销
         $groupbuy_list = Model('groupbuy')->getGroupbuyListByGoodsCommonIDString(implode(',', $commonid_array));
         $xianshi_list = Model('p_xianshi_goods')->getXianshiGoodsListByGoodsString(implode(',', $goodsid_array));
@@ -43,61 +36,28 @@ class goods_helper
         {
             //抢购
             if (isset($groupbuy_list[$value['goods_commonid']])) {
-                $goods_list[$key]['goods_price'] = $groupbuy_list[$value['goods_commonid']]['groupbuy_price'];
-                $goods_list[$key]['group_flag'] = true;
+                $value['goods_price'] = $groupbuy_list[$value['goods_commonid']]['groupbuy_price'];
+                $value['group_flag'] = true;
             } else {
-                $goods_list[$key]['group_flag'] = false;
+                $value['group_flag'] = false;
             }
 
             //限时折扣
-            if (isset($xianshi_list[$value['goods_id']]) && !$goods_list[$key]['group_flag']) {
-                $goods_list[$key]['goods_price'] = $xianshi_list[$value['goods_id']]['xianshi_price'];
-                $goods_list[$key]['xianshi_flag'] = true;
+            if (isset($xianshi_list[$value['goods_id']]) && !$value['group_flag']) {
+                $value['goods_price'] = $xianshi_list[$value['goods_id']]['xianshi_price'];
+                $value['xianshi_flag'] = true;
             } else {
-                $goods_list[$key]['xianshi_flag'] = false;
+                $value['xianshi_flag'] = false;
             }
 
             //商品图片url
-            $goods_list[$key]['goods_image_url'] = cthumb($value['goods_image'], 360, $value['store_id']);
-
-            unset($goods_list[$key]['store_id']);
-            unset($goods_list[$key]['nc_distinct']);
-            unset($goods_list[$key]['gc_id']);
-            unset($goods_list[$key]['goods_image']);
-            unset($goods_list[$key]['goods_salenum']);
-            unset($goods_list[$key]['evaluation_good_star']);
-            unset($goods_list[$key]['evaluation_count']);
-            unset($goods_list[$key]['is_virtual']);
-            unset($goods_list[$key]['is_presell']);
-            unset($goods_list[$key]['is_fcode']);
-            unset($goods_list[$key]['have_gift']);
-            unset($goods_list[$key]['group_flag']);
-            unset($goods_list[$key]['xianshi_flag']);
-            unset($goods_list[$key]['goods_storage']);
-            unset($goods_list[$key]['goods_storage_alarm']);
-            unset($goods_list[$key]['goods_attr']);
-
-            $goods_list[$key]['goods_state'] = 1;
-            $goods_list[$key]['goods_storage_state'] = 1;
+            $value['goods_image_url'] = cthumb($value['goods_image'], 360, $value['store_id']);
+            $value['goods_state'] = 1;
+            $value['goods_storage_state'] = 1;
 
-//            // 品牌名
-//            $brand = Model()->table("brand")->find($value['brand_id']);
-//            if (!empty($brand)) {
-//                $value['brand_name'] = $brand['brand_name'];
-//            }
-//
-//            // 分类
-//            $gc_info = Model()->table('goods_class')->find($value['gc_id']);
-//            if (!empty($gc_info)) {
-//                $value['gc_name'] = $gc_info['gc_name'];
-//            }
-//
-//            // 功效列表
-//            $goods_common = Model('goods');
-//            $goods_common_info = $goods_common->getGoodeCommonInfoByID($value['goods_commonid']);
-//            if (!empty($goods_common_info)) {
-//                $value['goods_attr'] = $this->parse_efficacy(unserialize($goods_common_info['goods_attr']));
-//            }
+            $fields = 'store_id,nc_distinct,gc_id,goods_image,goods_salenum,evaluation_good_star,evaluation_count,is_virtual,is_presell,' .
+                'is_fcode,have_gift,goods_storage,goods_storage_alarm,goods_attr,group_flag,xianshi_flag';
+            field_helper::unset_column($value,$fields);
         }
 
         return $goods_list;

+ 1 - 0
mobile/control/index.php

@@ -213,6 +213,7 @@ class indexControl extends mobileHomeControl
     {
         $goods_ids = rkcache('home_goods',true);
 
+
         $ret = array_chunk($goods_ids,$this->page_size());
         $pages = count($ret);
         $page_no = $pages >= $this->page_no() ? $this->page_no() : $pages;