Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Our/ImageConst.php

@@ -42,7 +42,7 @@ class ImageConst{
     //商品、商家头像等默认图片路径
     const defaultPath = 'mall/common/';
 
-    const storeClassAdvImagePrefix = 'mall/store/goods/classify';
+    const storeClassAdvImagePrefix = 'mall/store/goods/classify/';
 
     const defaultMemberAvatarName = 'default_member_avatar.jpg';
 

application/models/Business/Goods/GoodsClassService.php

@@ -315,12 +315,16 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
                     $childrenClasses = array();
                     if(isset($treeGcIds[$secondGcId][\Our\ApiConst::zero])&&$newPlatThirdGcList){
                         foreach($treeGcIds[$secondGcId][\Our\ApiConst::zero] as $tempPaltThirdGcId){
-                            $childrenClasses[] = $newPlatThirdGcList[$tempPaltThirdGcId];
+                            $tempPlatClass = $newPlatThirdGcList[$tempPaltThirdGcId];
+                            $tempPlatClass['storeFlag'] = \Our\ApiConst::zero;
+                            $childrenClasses[] = $tempPlatClass;
                         }
                     }
                     if(isset($treeGcIds[$secondGcId][\Our\ApiConst::one])&&$storeThirdGcList){
                         foreach($treeGcIds[$secondGcId][\Our\ApiConst::one] as $tempStoreThirdGcId){
-                            $childrenClasses[] = $storeThirdGcList[$tempStoreThirdGcId];
+                            $tempStoreClass = $storeThirdGcList[$tempStoreThirdGcId] ;
+                            $tempStoreClass['storeFlag'] = \Our\ApiConst::one;
+                            $childrenClasses[] = $tempStoreClass;
                         }
                     }
                     $returnTemp['childClasses'] = $childrenClasses;

application/models/DAO/GoodsClass/GoodsClassThird.php

@@ -34,7 +34,7 @@ class GoodsClassThirdModel extends \DAO\AbstractModel{
 
     public function getListByIdsFromCache($ids){
         $field = $this->thirdStoreClassField;
-        $returnList = \Our\RedisHelper::cachedFunction(\Redis\Db3\GoodsClassThirdModelRedisModel::getInstance(),array(&$this, 'getListByIds'),array($ids,$field),\Our\ApiConst::oneDaySecond);
+        $returnList = \Our\RedisHelper::cachedFunction(\Redis\Db3\GoodsClassThirdRedisModel::getInstance(),array(&$this, 'getListByIds'),array($ids,$field),\Our\ApiConst::oneDaySecond);
         return $returnList;
     }
 
@@ -51,7 +51,7 @@ class GoodsClassThirdModel extends \DAO\AbstractModel{
         $whereSql = $this->db->getSqlWhereByArray($where);
         $this->db->select($field)->from($this->_tableName)->where($whereSql);
         foreach($order as $key=>$val){
-            $this->db->order($val,$key);
+            $this->db->order($key,$val);
         }
         $list =$this->db->fetchAll();
         $returnList = array();

application/models/Redis/Db3/GoodsClassThirdRedis.php

@@ -6,7 +6,7 @@ namespace Redis\Db3;
  * Time: 17:54
  * Description:
  */
-class GoodsClassThirdModelRedisModel  extends \Redis\Db3\AbstractModel{
+class GoodsClassThirdRedisModel  extends \Redis\Db3\AbstractModel{
     /**
      * 表名
      *