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

application/models/DAO/Goods.php

@@ -74,7 +74,9 @@ class GoodsModel extends \DAO\AbstractModel {
 
     public function getList($where,$field){
         $this->setDb();
-        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+       $res= $this->db->select($field)->from($this->_tableName)->where($where)->order('goods_storage','desc')->fetchAll();
+       return $res;
+
     }
     public function getListGroup($where,$field,$groupField){
         $this->setDb($this->dbName);

scripts/crontab/store/storeStat.php → scripts/crontab/store/stat.php

@@ -7,13 +7,13 @@ error_reporting(E_ALL ^ E_NOTICE);
 /**
  * 店铺数据统计
  * 执行时间：每分钟执行一次
- * Class cliStoreStoreStat
+ * Class cliStoreStat
  * User: King <358887571@qq.com>
  * Date: 2018/11/30 0030
  * Time: 下午 3:00
  *
  */
-class cliStoreStoreStat extends basecli
+class cliStoreStat extends basecli
 {
     const CLI_ADMIN_ID = 255;
     private $bDoUnLock  = FALSE;   // 是否允许释放 LOCK 文件
@@ -97,7 +97,7 @@ class cliStoreStoreStat extends basecli
     }
 }
 
-$oCli = new cliStoreStoreStat(TRUE);
+$oCli = new cliStoreStat(TRUE);
 
 EXIT;
 ?>