Skip to content

M
my-yaf-project
Commit 465e7327 authored by zhz's avatar zhz
Browse files
Options

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

parents cfc13beb e2f657e5
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 1 deletion
application/models/Business/Common/AdvService.php
View file @ 465e7327
...@@ -168,6 +168,7 @@ class AdvServiceModel extends \Business\AbstractModel{ ...@@ -168,6 +168,7 @@ class AdvServiceModel extends \Business\AbstractModel{
return $advs; return $advs;
} }
public function checkAdvWhere($where){ public function checkAdvWhere($where){
if(!$where['storeId']){ if(!$where['storeId']){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyAdvStore); \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyAdvStore);
......
application/models/Business/User/ShareService.php
View file @ 465e7327
...@@ -9,6 +9,7 @@ use Error\ErrorModel; ...@@ -9,6 +9,7 @@ use Error\ErrorModel;
use Our\ApiConst; use Our\ApiConst;
use Our\Common; use Our\Common;
use Our\CommonExtension; use Our\CommonExtension;
use Our\DbNameConst;
use Our\ImageConst; use Our\ImageConst;
use Our\ImageUtil; use Our\ImageUtil;
use Our\NameConst; use Our\NameConst;
...@@ -34,6 +35,10 @@ class ShareServiceModel extends \Business\AbstractModel ...@@ -34,6 +35,10 @@ class ShareServiceModel extends \Business\AbstractModel
$driverType = \Our\Common::getDriverType(); $driverType = \Our\Common::getDriverType();
$data['driverType'] = $driverType; $data['driverType'] = $driverType;
$data['qrCode']=$this->growQrcode($data); $data['qrCode']=$this->growQrcode($data);
if($data['type']==ApiConst::shareStore){
$storeDao=\DAO\StoreMemberModel::getInstance(DbNameConst::salveDBConnectName);
$data['address']=$storeDao->getAddress($data['id']);
}
// $data['qrCode']=\Our\RedisHelper::cachedFunction(\Redis\Db0\MemberRedisModel::getInstance(), array(&$this, 'growQrcode'), array($data)); // $data['qrCode']=\Our\RedisHelper::cachedFunction(\Redis\Db0\MemberRedisModel::getInstance(), array(&$this, 'growQrcode'), array($data));
return $data; return $data;
......
application/models/DAO/Adv/Adv.php
View file @ 465e7327
...@@ -50,6 +50,11 @@ class AdvModel extends \DAO\AbstractModel{ ...@@ -50,6 +50,11 @@ class AdvModel extends \DAO\AbstractModel{
} }
public function delAdvCache($positionId){
\Our\Log::getInstance()->write('调用广告位'.$positionId);
\Our\RedisHelper::delCachedFunction(\Redis\Db9\AdvRedisModel::getInstance(), array(&$this, 'getPostionAdv'),array(),array($positionId));
}
/** /**
* 类实例 * 类实例
*/ */
......
application/models/DAO/Adv/AdvMobile.php
View file @ 465e7327
...@@ -45,6 +45,12 @@ class AdvMobileModel extends \DAO\AbstractModel{ ...@@ -45,6 +45,12 @@ class AdvMobileModel extends \DAO\AbstractModel{
$result = $this->db->fetchAll(); $result = $this->db->fetchAll();
return $result; return $result;
} }
public function delAdvMobile($store){
$advRedis = \Redis\Db9\AdvRedisModel::getInstance();
$storeMiddleAdvsKey = \Our\NameConst::storeMiddleAdvsPrefix.$store;
$advRedis->tableDel($storeMiddleAdvsKey);
}
/** /**
* 类实例 * 类实例
*/ */
......
application/models/DAO/Order/RefundReason.php
View file @ 465e7327
...@@ -82,6 +82,7 @@ class RefundReasonModel extends \DAO\AbstractModel ...@@ -82,6 +82,7 @@ class RefundReasonModel extends \DAO\AbstractModel
public function getAll($fields='*'){ public function getAll($fields='*'){
$this->setDb($this->dbName); $this->setDb($this->dbName);
$list = $this->db->from($this->_tableName)->select($fields)->fetchAll(); $list = $this->db->from($this->_tableName)->select($fields)->fetchAll();
$list=$list?$list:array();
return $list; return $list;
} }
......
application/models/DAO/Store.php
View file @ 465e7327
...@@ -258,7 +258,20 @@ class StoreModel extends \DAO\AbstractModel ...@@ -258,7 +258,20 @@ class StoreModel extends \DAO\AbstractModel
$returnStores = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getOnlineStores'), array($condition, $field), \Our\ApiConst::oneHour, array($cityCode)); $returnStores = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this, 'getOnlineStores'), array($condition, $field), \Our\ApiConst::oneHour, array($cityCode));
return $returnStores; return $returnStores;
} }
public function getAddress($storeId){
$storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
//地址
$address = '';
if($storeInfo['area_info']){
$address .= $storeInfo['area_info'];
}
if($storeInfo['store_address']){
$address .= $storeInfo['store_address'];
}
return $address;
}
public function get($storeId,$label = true) public function get($storeId,$label = true)
{ {
$storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId)); $storeInfo = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$this, 'getInfoById'),array($storeId),\Our\ApiConst::sevenDaySecond,array($storeId));
......
application/views/qa/list.phtml
View file @ 465e7327
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<body> <body>
<div class="detail"> <div class="detail">
<ul> <ul>
<?php phpinfo(); <?php
$len = count($problemList); $len = count($problemList);
foreach($problemList as $key=>$problem){?> foreach($problemList as $key=>$problem){?>
<li <?php if($key==($len-1)){?> class="li-last"<?php }?> onclick="goToDetail('<?php echo $problem['problemId'];?>')"><?php echo $problem['problemTitle']?></li> <li <?php if($key==($len-1)){?> class="li-last"<?php }?> onclick="goToDetail('<?php echo $problem['problemId'];?>')"><?php echo $problem['problemTitle']?></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment