Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

core/33hao.php

@@ -13,6 +13,9 @@ if (!@include(BASE_DATA_PATH.'/config/config.ini.php')) exit('config.ini.php isn
 if (file_exists(BASE_PATH.'/config/config.ini.php')){
 	include(BASE_PATH.'/config/config.ini.php');
 }
+
+@date_default_timezone_set('Asia/Shanghai');
+
 global $config;
 //默认平台店铺id
 define('DEFAULT_PLATFORM_STORE_ID', $config['default_store_id']);

core/framework/function/core.php

@@ -1159,13 +1159,22 @@ function getStoreDecorationImageUrl($image_name = '', $store_id = null) {
 /**
  * 获取运单图片地址
  */
-function getWaybillImageUrl($image_name = '') {
+function getWaybillImageUrl($image_name = '')
+{
     $image_path = DS . ATTACH_WAYBILL . DS . $image_name;
-    if(is_file(BASE_UPLOAD_PATH . $image_path)) {
-        return UPLOAD_SITE_URL . $image_path;
-    } else {
-        return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
-    }
+	
+	if(defined('USE_REMOTE_IMAGE') && USE_REMOTE_IMAGE == true)
+	{
+		return UPLOAD_SITE_URL . $image_path;
+	}
+	else
+	{
+		if(is_file(BASE_UPLOAD_PATH . $image_path)) {
+			return UPLOAD_SITE_URL . $image_path;
+		} else {
+			return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
+		}
+	}
 }
 
 /**
@@ -1178,11 +1187,19 @@ function getMbSpecialImageUrl($image_name = '') {
     } else {
         $image_path = DS . ATTACH_MOBILE . DS . 'special' . DS . $image_name;
     }
-    if(is_file(BASE_UPLOAD_PATH . $image_path)) {
-        return UPLOAD_SITE_URL . $image_path;
-    } else {
-        return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
-    }
+
+	if(defined('USE_REMOTE_IMAGE') && USE_REMOTE_IMAGE == true)
+	{
+		return UPLOAD_SITE_URL . $image_path;
+	}
+	else
+	{
+		if(is_file(BASE_UPLOAD_PATH . $image_path)) {
+			return UPLOAD_SITE_URL . $image_path;
+		} else {
+			return UPLOAD_SITE_URL.'/'.defaultGoodsImage('240');
+		}
+	}
 }
 
 /**
@@ -1456,6 +1473,27 @@ function mk_dir($dir, $mode = '0777') {
 }
 
 /**
+ * 初始化分页
+ */
+function initpage($page,$curpage)
+{
+	if (!empty($_GET['page'])) {
+		pagecmd('seteachnum', $page);
+	} else {
+		pagecmd('seteachnum', 10);
+	}
+
+	if (!empty($_GET['curpage'])) {
+		pagecmd('setnowpage', $curpage);
+	} else {
+		pagecmd('setnowpage', 1);
+	}
+
+	pagecmd('settotalnum', 1);
+	pagecmd('settotalpage');
+}
+
+/**
  * 封装分页操作到函数，方便调用
  *
  * @param string $cmd 命令类型

core/framework/function/goods.php

@@ -72,11 +72,19 @@ function cthumb($file, $type = '', $store_id = false)
         $store_id = substr ( $fname, 0, strpos ( $fname, '_' ) );
     }
     // 本地存储时，增加判断文件是否存在，用默认图代替
-    if ( !file_exists(BASE_UPLOAD_PATH . '/' . ATTACH_GOODS . '/' . $store_id . '/' . ($type == '' ? $file : str_ireplace('.', '_' . $type . '.', $file)) )) {
-        return UPLOAD_SITE_URL.'/'.defaultGoodsImage($type);
+
+    if(defined('USE_REMOTE_IMAGE') && USE_REMOTE_IMAGE == true) {
+        $thumb_host = UPLOAD_SITE_URL . '/' . ATTACH_GOODS;
+        return $thumb_host . '/' . $store_id . '/' . ($type == '' ? $file : str_ireplace('.', '_' . $type . '.', $file));
+    }
+    else
+    {
+        if ( !file_exists(BASE_UPLOAD_PATH . '/' . ATTACH_GOODS . '/' . $store_id . '/' . ($type == '' ? $file : str_ireplace('.', '_' . $type . '.', $file)) )) {
+            return UPLOAD_SITE_URL.'/'.defaultGoodsImage($type);
+        }
+        $thumb_host = UPLOAD_SITE_URL . '/' . ATTACH_GOODS;
+        return $thumb_host . '/' . $store_id . '/' . ($type == '' ? $file : str_ireplace('.', '_' . $type . '.', $file));
     }
-    $thumb_host = UPLOAD_SITE_URL . '/' . ATTACH_GOODS;
-    return $thumb_host . '/' . $store_id . '/' . ($type == '' ? $file : str_ireplace('.', '_' . $type . '.', $file));
 }
 /**
  * 商品二维码

core/lrlz.php

@@ -7,6 +7,8 @@
  *
  */
 
+@date_default_timezone_set('Asia/Shanghai');
+
 global $config;
 
 //默认平台店铺id

data/model/cache.model.php

@@ -88,7 +88,7 @@ class cacheModel extends Model {
 	 * @return array
 	 */
 	private function _express(){
-	    $fields = 'id,e_name,e_code,e_kdn_code,e_letter,e_order,e_url,e_zt_state';
+	    $fields = 'id,e_name,e_code,e_letter,e_order,e_url,e_zt_state';
 		$list = $this->table('express')->field($fields)->order('e_order,e_letter')->where(array('e_state'=>1))->limit(false)->select();
 		if (!is_array($list)) return null;
 		$array = array();

data/model/cart.model.php

@@ -165,6 +165,32 @@ class cartModel extends Model
     }
 
     /**
+     * 获取数量
+     *
+     * @param $condition
+     * @param string $field
+     * @return mixed
+     */
+    public function getCartListCount($condition, $field = '*')
+    {
+        return $this->table('cart')->where($condition)->group('')->count1($field);
+    }
+
+    /**
+     * 获取购物车列表
+     *
+     */
+    public function getCartList($condition, $page = 0)
+    {
+        $count = $this->getCartListCount($condition);
+        $cart_list = array();
+        if ($count != 0) {
+            $cart_list = $this->table('cart')->where($condition)->page($page, $count)->order('cart_id desc')->select();
+        }
+        return $cart_list;
+    }
+
+    /**
      * 购物车列表
      *
      * @param string $type 存储类型 db,cookie

fooder.php

@@ -1,6 +1,6 @@
 <?php
 
-date_default_timezone_set('UTC');
+@date_default_timezone_set('Asia/Shanghai');
 
 define('BASE_CORE_PATH',BASE_ROOT_PATH.'/core');
 define('BASE_DATA_PATH',BASE_ROOT_PATH.'/data');

mobile/control/control.php

@@ -125,7 +125,7 @@ class mbMemberControl extends mobileControl
     }
 
     /**
-     * 校验token
+     * 校验token+-
      *
      * @param $token
      * @return bool

mobile/control/goods.php

@@ -19,27 +19,6 @@ class goodsControl extends mobileHomeControl
     }
 
     /**
-     * 初始化分页
-     */
-    public function _initpage()
-    {
-        if (!empty($_GET['page'])) {
-            pagecmd('seteachnum', $_GET['page']);
-        } else {
-            pagecmd('seteachnum', 10);
-        }
-
-        if (!empty($_GET['curpage'])) {
-            pagecmd('setnowpage', $_GET['curpage']);
-        } else {
-            pagecmd('setnowpage', 1);
-        }
-
-        pagecmd('settotalnum', 1);
-        pagecmd('settotalpage');
-    }
-
-    /**
      * 商品列表接口
      *
      * 请求参数：
@@ -55,8 +34,11 @@ class goodsControl extends mobileHomeControl
      */
     public function goods_listOp()
     {
+        $page = trim($_GET['page']);
+        $curpage = trim($_GET['curpage']);
+        initpage($page,$curpage);
+
         $model_goods = Model('goods');
-        $this->_initpage();
         $condition = array();
         if (!empty(trim($_GET['gc_id']))) {
             $condition['gc_id'] = intval($_GET['gc_id']);

mobile/control/member_cart.php

@@ -29,12 +29,19 @@ class member_cartControl extends mbMemberControl
             return joutput_error($this->err_code);
         }
 
+        $page = trim($_GET['page']);
+        $curpage = trim($_GET['curpage']);
+        initpage($page,$curpage);
+
         $model_cart = Model('cart');
         $model_goods = Model('goods');
 
+//        $condition = array('buyer_id' => trim($_GET['buyer_id']));
         $condition = array('buyer_id' => $this->member_info['member_id']);
-        $cart_list = $model_cart->listCart('db', $condition);
-        $sum = 0;
+        $cart_list = $model_cart->getCartList($condition,$this->page);
+        $page_count = $model_cart->gettotalpage();
+        $model_cart->cls();
+//        $cart_list = $model_cart->listCart('db', $condition);
         foreach ($cart_list as $key => $value) {
             $goods_id = $value['goods_id'];
             $goods_promotion = $model_goods->getGoodsInfoAndPromotionById($goods_id);
@@ -62,10 +69,9 @@ class member_cartControl extends mbMemberControl
             $cart_list[$key]['promotion_price'] = $promotion_price;
             $cart_list[$key]['goods_image_url'] = cthumb($value['goods_image'], $value['store_id']);
             $cart_list[$key]['goods_sum'] = ncPriceFormat($value['goods_price'] * $value['goods_num']);
-            $sum += $cart_list[$key]['goods_sum'];
         }
 
-        joutput_data(array('cart_list' => $cart_list, 'sum' => ncPriceFormat($sum)));
+        joutput_data(array('cart_list' => $cart_list,'mobile_page' => mobile_page($page_count)));
     }
 
     /**

mobile/control/member_order.php

@@ -29,10 +29,14 @@ class member_orderControl extends mbMemberControl
             return joutput_error($this->err_code);
         }
 
+        $page = trim($_GET['page']);
+        $curpage = trim($_GET['curpage']);
+        initpage($page, $curpage);
+
         $model_order = Model('order');
         $condition = array();
         $condition['buyer_id'] = $this->member_info['member_id'];
-        $order_list_array = $model_order->getNormalOrderList($condition, 30, '*', 'order_id desc', '', array('order_address', 'order_goods'));
+        $order_list_array = $model_order->getNormalOrderList($condition, $this->page, '*', 'order_id desc', '', array('order_address', 'order_goods'));
         $order_group_list = array();
         $order_pay_sn_array = array();
         foreach ($order_list_array as $value) {
@@ -69,6 +73,7 @@ class member_orderControl extends mbMemberControl
         }
 
         $page_count = $model_order->gettotalpage();
+        $model_order->cls();
 
         $array_data = array('order_group_list' => $new_order_group_list);
         if (isset($_GET['getpayment']) && $_GET['getpayment'] == "true") {
@@ -83,7 +88,9 @@ class member_orderControl extends mbMemberControl
             }
             $array_data['payment_list'] = $payment_array;
         }
-        joutput_data($array_data, mobile_page($page_count));
+
+        $array_data['mobile_page'] = mobile_page($page_count);
+        joutput_data($array_data);
     }
 
     /**
@@ -223,20 +230,19 @@ class member_orderControl extends mbMemberControl
         }
 
         $express = rkcache('express', true);
-        $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_kdn_code'];
+        $e_code = $express[$order_info['extend_order_common']['shipping_express_id']]['e_code'];
         $e_name = $express[$order_info['extend_order_common']['shipping_express_id']]['e_name'];
 
         $key = "express_" . $order_info['shipping_code'];
         $deliver_info = rkcache($key);
-        if(empty($deliver_info))
-        {
+        if (empty($deliver_info)) {
             $deliver_info = $this->getOrderTracesByJson('STO', '3304699247030');
             //$deliver_info = $this->_get_express($e_code, $order_info['shipping_code']);
             //$deliver_info = $this->getOrderTracesByJson($e_code,$order_info['shipping_code']);
             if ($deliver_info === false) {
                 return;
             }
-            wkcache($key,$deliver_info,3600);
+            wkcache($key, $deliver_info, 3600);
         }
 
         $deliver_info = json_decode($deliver_info, true);