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

application/models/Business/Goods/GoodsClassService.php

@@ -91,10 +91,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
         }
         //获取可快递店铺对应分类
 
+        /*
         $expressClassIds = $this->getExpressStoreClasses($where);
         if($expressClassIds){
             $classIds = array_merge($expressClassIds,$classIds);
         }
+        */
         $classIdKeys = array_flip($classIds);
         $goodsClassDao = \DAO\GoodsClassModel::getInstance();
         $parentClasses = $goodsClassDao->getParentClasses();

application/models/Business/Store/StoreService.php

@@ -562,7 +562,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         //服务分类对应店铺
         $serviceStores = $this->getServiceClassStores($gcId,$condition);
         //获取签约分类对应店铺
-        $expressStores = $this->getExpressStores($gcId,$condition);
+        //$expressStores = $this->getExpressStores($gcId,$condition);
 
         $goodsClassList = $goodsClassDao->getOnlineSecondClassList($gcId);
 
@@ -578,9 +578,10 @@ class StoreServiceModel extends \Business\AbstractModel{
                     $exitStore = $allStores[$signStores[$goodsClass['gcId']]];
                 }else if($serviceStores&&in_array($goodsClass['gcId'],array_keys($serviceStores))){
                     $exitStore = $allStores[$serviceStores[$goodsClass['gcId']]];
-                }else if($expressStores&&in_array($goodsClass['gcId'],array_keys($expressStores))){
-                    $exitStore = $allStores[$expressStores[$goodsClass['gcId']]];
                 }
+                /*else if($expressStores&&in_array($goodsClass['gcId'],array_keys($expressStores))){
+                    $exitStore = $allStores[$expressStores[$goodsClass['gcId']]];
+                }*/
                 if($memberStores){
                     if($memberStores&&in_array($goodsClass['gcId'],array_keys($memberStores))){
                         $purchasedStore = $allStores[$memberStores[$goodsClass['gcId']]];

application/models/DAO/StoreGoodsClassGoods.php

@@ -27,7 +27,7 @@ class StoreGoodsClassGoodsModel extends \DAO\AbstractModel {
     public function getList($where,$field,$order = true){
         $this->setDb($this->dbName);
         if($order){
-            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','DESC')->fetchAll();
+            return $this->db->select($field)->from($this->_tableName)->where($where)->order('gc_sort','ASC')->fetchAll();
         }
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
     }