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

application/models/Business/Store/StoreService.php

@@ -35,7 +35,7 @@ class StoreServiceModel extends \Business\AbstractModel{
 
         //更新店铺基础数据
         $where = 'store_id in (select ss.store_id from han_stat_store ss) and store_id in (select se.store_id from han_store_extend se where se.gmt_update > '.$beginTime.' )';
-        $field = 'store_id,store_state,store_time,store_end_time,province_id,city_id,area_id,(select se.cashed_deposit from han_store_extend se where se.store_id=han_store.store_id) cashed_deposit';
+        $field = 'store_id,store_name,store_state,store_time,store_end_time,province_id,city_id,area_id,(select se.cashed_deposit from han_store_extend se where se.store_id=han_store.store_id) cashed_deposit';
         if($datas = $storeDao->getStores($where, $field)) {
             echo 'extend in:'.count($datas);
             foreach ($datas as $key=>$val) {

application/models/DAO/Adv/Adv.php

@@ -39,7 +39,8 @@ class AdvModel extends \DAO\AbstractModel{
             foreach($advs as $adv){
                 $advContent=unserialize($adv['adv_content']);
                 if($advContent['adv_pic_url']){
-                    $temp['href']=\Our\NameConst::httpPrefix.$advContent['adv_pic_url'];
+                   // $temp['href']=\Our\NameConst::httpPrefix.$advContent['adv_pic_url'];
+                    $temp['href']=$advContent['adv_pic_url'];
                 }
                 $temp['imageUrl']=\Our\Common::getStaticFile($advContent['adv_pic'],\Our\ImageConst::advPath);
                 $result[] = $temp;