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

application/controllers/Store.php

@@ -15,7 +15,7 @@ class StoreController extends \Our\Controller_AbstractIndex {
     public function getStoreInfoAction(){
         $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId);
         //.
-        $storeInfo['adv'] = array('href'=>'http://qm.22ca.com/qm/tmpl/goods.html?goods_commonid=101654','imageUrl'=>'http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/data/upload/mall/adv/05715960161498410.jpg');
+        $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/models/Business/Goods/GoodsCommonService.php

@@ -261,7 +261,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         if(is_array($list) && !empty($list)){
             $totalCount = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonDAO, 'getCount'),array(implode(' and ',$where),$attrStr),\Our\ApiConst::oneDaySecond,array($storeId));
             foreach ($list as $v){
-                $v['goodsImage'] = \DAO\GoodsCommonModel::getInstance()->getGoodsImgSrc($v['goods_image'],360);
+                $v['goodsImage'] = \DAO\GoodsCommonModel::getInstance()->getGoodsImgSrc($v['goodsImage'],360);
                 $v['goodsPrice'] = (int)$v['goodsPrice'];
                 unset($v['goods_price']);
                 $goods[] = $v;

application/models/Business/Store/StoreService.php

@@ -54,7 +54,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 if($param['sid']) {
                     $sale = \DAO\SaleModel::getInstance()->getOne(array('sale_id'=>$param['sid']),'sale_act_id,member_id');
                     if($sale) {
-                        \DAO\SaleMemberModel::getInstance()->insert(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['member_id'],'member_id'=>$memberId,'storeId'=>$storeId));
+                        \DAO\SaleMemberModel::getInstance()->insert(array('sale_id'=>$sale['member_id'],'sale_act_id'=>$sale['sale_act_id'],'member_id'=>$memberId,'storeId'=>$storeId));
                     }
                 }
             }else{