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

application/models/Business/Common/AdvService.php

@@ -163,9 +163,15 @@ class AdvServiceModel extends \Business\AbstractModel{
             }
         }else{
             $storeAdvPositionDao = \DAO\Adv\StoreAdvPositionModel::getInstance();
-            $storeAdvPosition = $storeAdvPositionDao->find(array('ap_id'=>\Our\ApiConst::storeAdvPositionTop));
-            $imageUrl = \Our\Common::getStaticFile($storeAdvPosition['default_content'],\Our\ImageConst::advSrcImagePath);
-            $advs[] = array('href'=>'','imageUrl'=>$imageUrl);
+            $storeAdvPosition = \Our\RedisHelper::cachedFunction(\Redis\Db9\StoreAdvPositionRedisModel::getInstance(),array(&$storeAdvPositionDao, 'find'),array(array('ap_id'=>$position)),\Our\ApiConst::oneHour,array($position));
+            if($storeAdvPosition&&$storeAdvPosition['default_content']){
+                $imageUrl = \Our\Common::getStaticFile($storeAdvPosition['default_content'],\Our\ImageConst::advPath);
+                $advs[] = array('href'=>'','imageUrl'=>$imageUrl);
+            }else{
+                $advs = array();
+            }
+            //$storeAdvPosition = $storeAdvPositionDao->find(array('ap_id'=>\Our\ApiConst::storeAdvPositionTop));
+
         }
         return $advs;
     }

application/models/DAO/Adv/StoreAdvPosition.php

@@ -28,6 +28,16 @@ class StoreAdvPositionModel extends \DAO\AbstractModel{
         return $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
     }
 
+    /**
+     * 删除缓存
+     * @param $apId
+     * @throws \Our\Exception
+     */
+    public function deleteStoreAdvPositionCache($apId){
+        \Our\RedisHelper::delCachedFunction(\Redis\Db9\StoreAdvPositionRedisModel::getInstance(),array(&$this, 'find'),array(),array($apId));
+    }
+
+
     public function getList($where,$field = \Our\NameConst::allField,$order=null){
         $this->setDb($this->dbName);
         $this->db->select($field)->from($this->_tableName)->where($where);

application/models/Redis/Db9/StoreAdvPositionRedis.php

+<?php
+namespace Redis\Db9;
+/**
+ * User: liuyuzhen
+ * Date: 2018/8/30
+ * Time: 10:20
+ * Description:
+ */
+class StoreAdvPositionRedisModel extends \Redis\Db9\AbstractModel {
+    /**
+     * 表名
+     *
+     * @var string
+     */
+    protected $_tableName = 'han_store_adv_position';
+
+
+
+    /**
+     * 类实例
+     *
+     */
+    private static $_instance = null;
+
+    /**
+     * 获取类实例
+     */
+    public static function getInstance() {
+        if (!(self::$_instance instanceof self)) {
+            self::$_instance = new self();
+        }
+
+        return self::$_instance;
+    }
+}
\ No newline at end of file

scripts/crontab/store/storeMonthSales.php

@@ -6,7 +6,7 @@
  */
 define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../../../')); //指向public的上一级
 require APPLICATION_PATH . '/scripts/crontab/common.php';
-$data = \DAO\Order\OrderModel::getInstance()->getCounts('payment_time >= '.(time()-30*24*60),'count(order_id) as num','store_id');
+$data = \DAO\Order\OrderModel::getInstance()->getCounts('payment_time >= '.(time()-30*24*60*60),'count(order_id) as num,store_id','store_id');
 //$data = \DAO\Order\OrderModel::getInstance()->getCounts('payment_time >= 1518303150','store_id,count(order_id) as num','store_id');
 if($data){
     foreach ($data as &$v){