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

application/models/Business/Store/ShopkeeperService.php

@@ -506,7 +506,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
             ErrorModel::throwException(CodeConfigModel::emptyStoreId);
         }
         $diliveryMan = \DAO\Order\DiliverymanModel::getInstance();
-        $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneHourCache, array($storeId));
+        $diliveryMans=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$diliveryMan, 'getDeliveryManByStoreId'), array($storeId), \Our\ApiConst::oneDaySecond, array($storeId));
         foreach($diliveryMans as &$dilivery){
             $dilivery['memberAvatar']=$memberDao->getMemberAvatar($dilivery['memberId']);
         }

application/models/DAO/Order/Diliveryman.php

@@ -107,6 +107,7 @@ class DiliverymanModel extends \DAO\AbstractModel
     }
     public function getDeliveryManByStoreId($storeId){
         $where['store_id']=$storeId;
+        $where['is_del']=ApiConst::zero;
         return $this->getByWhere($where);
     }