Merge branch 'master_dev' of tui.shenbd.com:api-project-dev/api.shenbd.com into ccw

application/controllers/Index.php

@@ -130,17 +130,32 @@ class IndexController extends \Our\Controller_Abstract  {
     }
     public function getSendHtmlAction(){
         $req=$this->getRequest()->getQuery();
-        if(empty($req['params'] )){
+        if(empty($req['cacheKey'] )){
             echo 'error';exit;
         }
-        $params=base64_decode($req['params']);
+        $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
+        $res= $this->memberDb0Redis->tableCacheGet($req['cacheKey']);
+        $params=unserialize($res);
+        $params=base64_decode($params);
         $params=\Our\Common::paramToJson($params);
         $shareService=\Business\User\ShareServiceModel::getInstance();
         $params['id']=$params['storeId'];
         $params['qrCode']=$shareService->getQrUrl($params);
         $this->_view->assign("params", $params);
-
     }
+//    public function getSendHtmlAction(){
+//        $req=$this->getRequest()->getQuery();
+//        if(empty($req['params'] )){
+//            echo 'error';exit;
+//        }
+//        $params=base64_decode($req['params']);
+//        $params=\Our\Common::paramToJson($params);
+//        $shareService=\Business\User\ShareServiceModel::getInstance();
+//        $params['id']=$params['storeId'];
+//        $params['qrCode']=$shareService->getQrUrl($params);
+//        $this->_view->assign("params", $params);
+//
+//    }
     public function getOpenHtmlAction(){
         $req=$this->getRequest()->getQuery();
         if(empty($req['params'] )){

application/models/Business/Store/ShopkeeperService.php

@@ -70,14 +70,17 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $storeFavariteCount = $favoritesStoreDao->getFavoritesCountByStoreIdCache($storeId);
         $todayTotalOnline=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderDao, 'getOrderOrderTotalOnlineByStoreId'), array($storeId,true), ApiConst::oneDaySecond, array($storeId));
         $orderTotalOnline=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeStaticDao, 'getByStoreId'), array($storeId), ApiConst::oneDaySecond, array($storeId));;
+        $commonDAO = \DAO\GoodsCommonModel::getInstance();
+        $count = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getCount'),array(array('store_id'=>$storeId)),\Our\ApiConst::oneDaySecond);
         $orderTotalOnline=$orderTotalOnline['orderTotalOnline']?$orderTotalOnline['orderTotalOnline']:ApiConst::zero;
         $goodsCount = $totalOrderCount['orderGoodsCount'];
         $orderTotal = $totalOrderCount['orderTotal'];
         $data['storeId'] = $store['store_id'];
         $data['storeName'] = $store['store_name'];
         $data['storeLabel'] = $store['store_label'];
-        $data['goodsCount'] = $goodsCount?$goodsCount:ApiConst::zero;
-        $data['goodsCount']=(int)$data['goodsCount'];
+//        $data['goodsCount'] = $goodsCount?$goodsCount:ApiConst::zero;
+        //$data['goodsCount']=(int)$data['goodsCount'];
+        $data['goodsCount']=$count;
         $data['orderCount'] = $storeStats['orderCount'];
         $data['orderTotal'] = $orderTotal?$orderTotal:ApiConst::zero;
         $data['orderTotal']= (int)$data['orderTotal'];