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

application/models/Business/Goods/GoodsCommonService.php

@@ -990,7 +990,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
                     \DAO\SaleOrderModel::getInstance(\Our\DbNameConst::masterDBConnectName)->insert($insert);
                 }
                 $saleOrderDAO = \DAO\SaleOrderModel::getInstance();
-                \Our\RedisHelper::delCachedFunction(\Redis\Db1\MemberCouponRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($orderGoods['buyer_id']));
+                \Our\RedisHelper::delCachedFunction(\Redis\Db1\SaleOrderRedisModel::getInstance(), array(&$saleOrderDAO, 'getOrderGoodsList'),array(),array($orderGoods['buyer_id']));
             }
             $pageBegin++;
         } while (!empty($orders['list']));

application/models/Redis/Db1/SaleOrderRedis.php

@@ -37,6 +37,7 @@ class SaleOrderRedisModel extends \Redis\Db1\AbstractModel {
     }
 
 
+
     public function tableHSet($h,$key,$val,$experio=0){
         return $this->hset($this->calcKey($h),$key,$val,$experio);
     }
@@ -52,7 +53,15 @@ class SaleOrderRedisModel extends \Redis\Db1\AbstractModel {
     public function tableHMGet($h,$keyvalues){
         return $this->hmget($this->calcKey($h),$keyvalues);
     }
-
+    public function tableDelAll($data){
+        return $this->delAll($data);
+    }
+    public function tableKeys($prekey){
+        return $this->keys($this->calcKey($prekey));
+    }
+    public function tableDel($key){
+        return $this->del($key);
+    }
     public function tableCacheGet($id){
         $result = $this->get($this->calcKey($id));
         return $result;

scripts/crontab/goods/recommend.php

@@ -57,7 +57,7 @@ class cliRecommend extends basecli
             echo '****create dir fail  ****';
             exit;
         }
-        $this->lockFileName = $lockDir .'.locks';
+        $this->lockFileName = $lockDir .'/goodsRecommend.locks';
         if( file_exists( $this->lockFileName ) )
         {
             $stat = stat($this->lockFileName);

scripts/crontab/order/evaluate.php

@@ -50,12 +50,12 @@ class cliOrderEvaluate extends basecli
             echo "*** Debug mode ***\n";
         }
         // Step: 02 检查是否已有相同CLI在运行中
-        $lockDir=$this->_getBaseFileName('orderConfirm');
+        $lockDir=$this->_getBaseFileName('orderEvaluate');
         if(!$this->mkdirs($lockDir)){
             echo '****create dir fail  ****';
             exit;
         }
-        $this->lockFileName = $lockDir . '/orderType_'. $this->orderType.'_orderResult_'.$this->orderResult. '.locks';
+        $this->lockFileName = $lockDir . '/orderEvaluate.locks';
         if( file_exists( $this->lockFileName ) )
         {
             $stat = stat($this->lockFileName);

scripts/crontab/order/saleGoods.php

@@ -55,7 +55,7 @@ class cliSaleOrder extends basecli
             echo '****create dir fail  ****';
             exit;
         }
-        $this->lockFileName = $lockDir .'.locks';
+        $this->lockFileName = $lockDir .'/orderSaleGoods.locks';
         if( file_exists( $this->lockFileName ) )
         {
             $stat = stat($this->lockFileName);