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

application/controllers/Store.php

@@ -15,8 +15,6 @@ class StoreController extends \Our\Controller_AbstractIndex {
     public function getStoreInfoAction(){
         $address = \Business\User\AddressServiceModel::getInstance()->getMyAddress($this->req[\Our\NameConst::data],$this->memberId);
         $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId, $address);
-        //.
-        $storeInfo['adv'] = array('href'=>'','imageUrl'=>'http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/data/upload/mall/adv/05715960161498410.jpg');
         $storeInfo['share'] = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::shareStore,$this->req[\Our\NameConst::data]['storeId']);
         $this->success($storeInfo);
     }

application/library/Our/DescribeConst.php

@@ -140,7 +140,7 @@ class DescribeConst
 
     const payOnlineName = '线上支付'; //线上支付
     const payOfflineName = '线下支付'; //线下支付
-    const payAogName = '到店自提'; //到店自提
+    const payAogName = '货到付款'; //货到付款
 
     const refund='退款';
     const refundRetund='退货';

application/library/Our/ImageConst.php

@@ -48,6 +48,7 @@ class ImageConst{
 
     const defaultStoreLabelName = 'default_store_avatar.jpg';
 
+    const defaultStoreBannerName = 'default_store_banner.jpg';
 
     //图片指向的域名
     const imageDomain="ossHost";

application/models/Business/Goods/GroupSaleService.php

@@ -255,7 +255,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
     public function getStorePBundlingList($storeId,$dbName = \Our\DbNameConst::salveDBConnectName,$withKeyFlag= false,$limit = ''){
         $pbundlingInstance = \DAO\PBundlingModel::getInstance($dbName);
         $limit == '' ? $limit = array(\Our\ApiConst::zero,\Our\ApiConst::five) : $limit = $limit;
-        $groupList = \Our\RedisHelper::cachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array($this->pBundingField,array('store_id'=>$storeId),$limit),\Our\ApiConst::oneDaySecond);
+        $groupList = \Our\RedisHelper::cachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array($this->pBundingField,array('store_id'=>$storeId),$limit),\Our\ApiConst::oneDaySecond, array($storeId));
         $newGroupList = $this->getPBundlingList($groupList,$dbName,$withKeyFlag);
         return $newGroupList;
     }

application/models/Business/Order/OrderService.php

@@ -886,6 +886,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderContent['payway'] = \Our\DescribeConst::afterPay;
                 }
                 $orderContent['orderAmount'] = $order['order_amount'];
+                $orderContents[]=$orderContent;
             }
             $orderIds[] = $order['order_id'];
         }

application/models/DAO/Store.php

@@ -105,8 +105,9 @@ class StoreModel extends \DAO\AbstractModel
         if ($img) {
             $storeLabel = \Our\Common::getStaticFile($img, \Our\ImageConst::storeLabel, 'ossHost');
         } else {
-            $storeLabel = \Our\Common::getStaticFile(ImageConst::defaultStoreLabelName, ImageConst::defaultPath);
+            $storeLabel = \Our\Common::getStaticFile(ImageConst::defaultStoreBannerName, ImageConst::defaultPath);
         }
+        $storeLabel .= "?x-oss-process=image/resize,m_fill,h_314,w_750";
         return $storeLabel;
     }
     /**