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

application/controllers/Cart.php

@@ -122,6 +122,31 @@ class CartController extends \Our\Controller_AbstractApi{
 
     }
 
+
+    /**
+     * 购物车购买
+     */
+    public function checkoutNewAction(){
+        $cartService = \Business\Cart\CartServiceModel::getInstance();
+        $data = $this->req[\Our\NameConst::data];
+        $sess=\Yaf\Session::getInstance();
+        $currentAddress = $sess->get('currentAddress');
+        $address = $cartService->checkCurrentAddress($currentAddress,$this->memberId);
+        $storeCartList = $cartService->checkCart($data,$this->memberId);
+        $pBundlingService = \Business\Goods\GroupSaleServiceModel::getInstance();
+        $cartList = $pBundlingService->getFormatCartListForOrder($storeCartList,$this->memberId,true);
+        $gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
+        $storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>$storeCartList['storeIds'],'goodsIds'=>$storeCartList['goodsIds'],'goodsCommonIds'=>$storeCartList['goodsCommonIds'],'blIds'=>$storeCartList['blIds'],'gcIds'=>$gcIds);
+        //var_dump($storeCartData);
+        $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
+        //$this->success($storeCartData);
+        $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData);
+        $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
+        $this->success($data);
+
+    }
+
+
     /**
      * 立即购买
      */
@@ -144,6 +169,28 @@ class CartController extends \Our\Controller_AbstractApi{
     }
 
 
+    /**
+     * 立即购买
+     */
+    public function buyNowNewAction(){
+        $cartService = \Business\Cart\CartServiceModel::getInstance();
+        $data = $this->req[\Our\NameConst::data];
+        $sess=\Yaf\Session::getInstance();
+        $currentAddress = $sess->get('currentAddress');
+        $address = $cartService->checkCurrentAddress($currentAddress,$this->memberId);
+        $cartService->checkBuynow($data,$this->memberId);
+        $pBundlingService = \Business\Goods\GroupSaleServiceModel::getInstance();
+        $cartList = $pBundlingService->getFormatBuyNowListForOrder($data,$this->memberId);
+        $gcIds = isset($cartList['gcIds'])?$cartList['gcIds']:array();
+        $storeCartData = array('cartList'=>$cartList['list'],'storeIds'=>array_keys($cartList['list']),'goodsIds'=>$cartList['goodsIds'],'goodsCommonIds'=>$cartList['goodsCommonIds'],'blIds'=>$cartList['blIds'],'gcIds'=>$gcIds);
+        $storeCartData = $cartService->checkCouponForCart($storeCartData,$this->memberId);
+        $storeCartData = $cartService->getDeliveryTypeForCartNew($address,$storeCartData);
+        //$this->success($storeCartData);
+        $data = $cartService->getFormatCartListForOrderNew($storeCartData,$address);
+        $this->success($data);
+    }
+
+
     public function addOrderAction(){
         $cartService = \Business\Cart\CartServiceModel::getInstance();
         $data = $this->req[\Our\NameConst::data];

application/controllers/Collection.php

@@ -31,6 +31,16 @@ class CollectionController extends \Our\Controller_AbstractApi {
 
     }
 
+    /**
+     * 扫码关注店铺
+     */
+    public function updateScanStoreAction(){
+        \Business\Store\StoreServiceModel::getInstance()->updateFavoritesStore($this->req[\Our\NameConst::data],$this->memberId);
+        $this->success(new \stdClass(),\Our\DescribeConst::scanSuccess);
+    }
+
+
+
     /**
      * 关注 商品
      *

application/controllers/Home.php

@@ -43,10 +43,22 @@ class HomeController extends \Our\Controller_AbstractIndex{
 
         $shareInfo = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::sharePlat);
         $returnData['shareInfo'] = $shareInfo;
+        $storeId = $this->getMyFavoritesStoreAction(true);
+        $returnData['relateStoreId'] = (int)$storeId;
         $this->success($returnData);
     }
 
 
+    public function getMyFavoritesStoreAction($flag = false){
+        $mebmerService = \Business\User\MemberServiceModel::getInstance();
+        $memberId=$this->sess->get('member_id');
+        $storeId =$mebmerService->getMyFavoritesStore($memberId);
+        if($flag){
+            return $storeId;
+        }
+        $this->success($storeId);
+    }
+
 
     /**
      * 设置当前地址

application/controllers/User.php

@@ -66,7 +66,8 @@ class UserController extends \Our\Controller_AbstractIndex {
                     $this->sess[NameConst::sessionKey]=$this->key;
                     $member[NameConst::sessionKey]=$this->key;
                     $this->memberService->saveMember($member);
-                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id']));
+                    $storeId =$this->memberService->getMyFavoritesStore($member['member_id']);
+                    $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'relateStoreId'=>(int)$storeId));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);
                 }
@@ -102,7 +103,9 @@ class UserController extends \Our\Controller_AbstractIndex {
                 $this->sess[NameConst::sessionKey]=$this->key;
                 $member[NameConst::sessionKey]=$this->key;
                 //$this->memberService->saveMember($member);
-                $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl']));
+
+                $storeId =$this->memberService->getMyFavoritesStore($member['member_id']);
+                $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'relateStoreId'=>(int)$storeId));
             }
 
             ErrorModel::throwException(CodeConfigModel::wxAuthInfoLoginFailed);
@@ -154,7 +157,8 @@ class UserController extends \Our\Controller_AbstractIndex {
             $member[NameConst::sessionKey]=$this->key;
             $member['login_time']=TIMESTAMP;
             $this->memberService->saveMember($member);
-            $this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id']));
+            $storeId =$this->memberService->getMyFavoritesStore($member['member_id']);
+            $this->success(array('userFlag'=>\Our\ApiConst::one,'key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'relateStoreId'=>(int)$storeId));
         }else{
             $this->success(array('userFlag'=>\Our\ApiConst::zero));
         }

application/library/Our/ApiConst.php

@@ -22,6 +22,7 @@ class ApiConst
     //一个小时
     const oneHour = 3600;
 
+    const halfHour = 1800;
     //预警时间
     const storageAlarmHour = 100000000000000;
 
@@ -38,6 +39,7 @@ class ApiConst
     //八小时秒数
     const EightHoursSecond = 28800;
     const hundred = 100;
+    const thousand = 1000;
     //1分钟秒数
     const oneMinSecond = 60;
     //成功状态码

application/library/Our/DescribeConst.php

@@ -76,6 +76,8 @@ class DescribeConst
 
     const collectSuccess = '关注成功';
 
+    const scanSuccess = '扫码关注成功';
+
     const cancelCollectSuccess = '取消关注成功';
 
     const moveToFavoritesSuccess = '移入收藏夹成功';

application/models/Business/Goods/GoodsClassService.php

@@ -193,7 +193,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
                 //判断签约分类是否可以为当前用户提供服务,并且记录这些店铺对应的store_id
                 if($inAreaFlag){
                     $store =$storeDao->getStoreInfoCache($signClass['store_id']);
-                    $class_distance  = \Our\CommonExtension::getDistance($lat,$lng,$store['store_latitude'],$signClass['store_latitude'],1);
+                    $class_distance  = \Our\CommonExtension::getDistance($lat,$lng,$store['store_latitude'],$store['store_latitude'],1);
                     $class = $signClass;
                     $class['class_distance'] = $class_distance;
                     $returnClass[$class_distance] = $class;

application/models/Business/Goods/GroupSaleService.php

@@ -6,9 +6,9 @@ use Our\ImageUtil;
 
 class GroupSaleServiceModel extends \Business\AbstractModel {
 
-    private $pBundingField = 'han_p_bundling.bl_id AS blId,bl_name AS name,bl_title,store_id,store_name,bl_state,bl_quota_starttime,bl_image,bl_storage,bl_discount_price AS discountPrice,bl_sum_price AS sumPrice,bl_quota_endtime AS endTime,image,is_transport,transport_id,snapshot_id,goods_freight,goods_free';
+    private $pBundingField = 'han_p_bundling.bl_id AS blId,bl_name AS name,bl_title,store_id,store_name,bl_state,bl_quota_starttime,bl_image,bl_storage,bl_discount_price AS discountPrice,bl_sum_price AS sumPrice,bl_quota_endtime AS endTime,image,is_transport,transport_id,snapshot_id,goods_freight,goods_free,delivery_template_id';
 
-    private $pBundingFieldWithDel = 'han_p_bundling.bl_id AS blId,bl_name AS name,bl_title,store_id,store_name,bl_state,bl_quota_starttime,bl_image,bl_storage,bl_discount_price AS discountPrice,bl_sum_price AS sumPrice,bl_quota_endtime AS endTime,image,is_transport,transport_id,snapshot_id,goods_freight,goods_free,is_del';
+    private $pBundingFieldWithDel = 'han_p_bundling.bl_id AS blId,bl_name AS name,bl_title,store_id,store_name,bl_state,bl_quota_starttime,bl_image,bl_storage,bl_discount_price AS discountPrice,bl_sum_price AS sumPrice,bl_quota_endtime AS endTime,image,is_transport,transport_id,snapshot_id,goods_freight,goods_free,is_del,delivery_template_id';
 
     private $pBundingGoodsField = 'bl_count_price AS discountPrice,num,goods_id,bl_id';
 
@@ -710,6 +710,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                             $tempObj['goodsList'] = \Our\Common::convertUnderline($pBundling['goodsList']);
                             $tempObj['goodsOriginalPrice'] = $pBundling['sumPrice'];
                             $tempObj['snapshot_id'] = (isset($pBundling['snapshot_id'])&&$pBundling['snapshot_id']>\Our\ApiConst::zero)?$pBundling['snapshot_id']:\Our\ApiConst::zero;
+                            $tempObj['delivery_template_id'] = (isset($pBundling['delivery_template_id'])&&$pBundling['delivery_template_id'])?$pBundling['delivery_template_id']:\Our\ApiConst::zero;
                         } else if ($tempCart['type'] == \Our\ApiConst::addGoodsToCart) {
                             $priceArray = \Goods\GoodsUtil::getInstance()->getRealPrice($tempCart['goods_id'],$memberId,null, \Our\ApiConst::addGoodsToCart,$dbName,true);
                             if(is_array($priceArray)){
@@ -754,6 +755,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                             $tempObj['gc_id']=$goodsCommonStorages[$tempCart['goods_commonid']]['gc_id'];
                             $tempObj['gc_id_2']=$goodsCommonStorages[$tempCart['goods_commonid']]['gc_id_2'];
                             $tempObj['gc_id_3']=$goodsCommonStorages[$tempCart['goods_commonid']]['gc_id_3'];
+                            $tempObj['delivery_template_id']=$goodsCommonStorages[$tempCart['goods_commonid']]['delivery_template_id']?$goodsCommonStorages[$tempCart['goods_commonid']]['delivery_template_id']:\Our\ApiConst::zero;
                             $allGcIds[] = $tempObj['gcId'];
                             $storeGcIds[] = $tempObj['gcId'];
                             if ($goodsStorage['onlineFlag'] == \Our\ApiConst::one) {
@@ -904,6 +906,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             }
             $storeTotalPrice += $pBundling['discountPrice']*$tempObj['goodsNum'];
             $tempObj['goodsList'] = \Our\Common::convertUnderline($pBundling['goodsList']);
+            $tempObj['delivery_template_id'] = $pBundling['delivery_template_id']?$pBundling['delivery_template_id']:\Our\ApiConst::zero;
             $tempObj['goodsOriginalPrice'] = $pBundling['sumPrice'];
 
         }else if(isset($data['goodsId'])){
@@ -962,6 +965,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             $tempObj['gc_id']=$goodsCommonStorages[$goods['goods_commonid']]['gc_id'];
             $tempObj['gc_id_2']=$goodsCommonStorages[$goods['goods_commonid']]['gc_id_2'];
             $tempObj['gc_id_3']=$goodsCommonStorages[$goods['goods_commonid']]['gc_id_3'];
+            $tempObj['delivery_template_id']=$goodsCommonStorages[$goods['goods_commonid']]['delivery_template_id']?$goodsCommonStorages[$goods['goods_commonid']]['delivery_template_id']:\Our\ApiConst::zero;
             $allGcIds[] = $tempObj['gcId'];
             $storeGcIds[] = $tempObj['gcId'];
             if ($goodsStorage['onlineFlag'] == \Our\ApiConst::one) {

application/models/Business/Store/StoreService.php

@@ -49,6 +49,8 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $storeMembers[] = $storeMember;
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $result = $favoritesStoreDao->insertAll($storeMembers);
+                $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
+                \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
             }else{
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');
@@ -373,6 +375,37 @@ class StoreServiceModel extends \Business\AbstractModel{
         }
     }
 
+    /**
+     * 上传当前用户的关注店铺
+     * @param $param
+     * @param $memberId
+     */
+    public function updateFavoritesStore($param,$memberId){
+        if(!(isset($param['storeId'])&&$param['storeId'])){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreId);
+        }
+        $storeId = trim($param['storeId']);
+        $storeInfo = \DAO\StoreModel::getInstance()->get($storeId,false);
+        if(!$storeInfo){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreInfo);
+        }
+        $storeMembers = array();
+        $storeMember = array();
+        $storeMember['store_id'] = $storeId;
+        $storeMember['member_id'] = $memberId;
+        $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
+        $storeMember['fav_type'] = \Our\ApiConst::one;
+        $storeMembers[] = $storeMember;
+        $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
+        $result = $favoritesStoreDao->insertAll($storeMembers);
+        if(!$result){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveScanStoreInfoFailed);
+        }
+        \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesStoreDao, 'getOne'),array(),array($memberId));
+        return true;
+
+    }
+
     /**
      * 获取搜索页推荐关键字
      * @param $param

application/models/Business/User/MemberService.php

@@ -361,6 +361,8 @@ class MemberServiceModel extends \Business\AbstractModel
                 \Our\Log::getInstance()->write(json_encode($storeMembers).'扫码数据写入失败');
                 return false;
             }
+            $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
         }
         $scan_sale_ids = $sess->get('scan_sale_ids');
         if($scan_sale_ids){
@@ -1077,5 +1079,24 @@ class MemberServiceModel extends \Business\AbstractModel
     }
 
 
+    /**
+     * 获取当前用户最新的扫码关注店铺
+     * @param $memberId
+     * @return int
+     * @throws \Our\Exception
+     */
+    public function getMyFavoritesStore($memberId){
+        if($memberId){
+            $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
+            $favStore = \Our\RedisHelper::cachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array('store_id',array('fav_from'=>\Our\ApiConst::scanFavor,'member_id'=>$memberId)),\Our\ApiConst::oneDaySecond,array($memberId));
+            if($favStore&&$favStore['store_id']){
+                return $favStore['store_id'];
+            }
+        }
+        return \Our\ApiConst::zero;
+    }
+
+
+
 
 }

application/models/DAO/FavoritesStore.php

@@ -45,9 +45,15 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         return $this->db->fetchAll();
     }
 
-    public function getOne($field,$where){
+    public function getOne($field,$where,$order = array('fav_time'=>'desc')){
         $this->setDb($this->dbName);
-        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
+        if($order){
+            foreach($order as $key=>$value){
+                $this->db->order($key,$value);
+            }
+        }
+        $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
+        return $result;
     }
 
     public function insert($param){

application/models/DAO/Goods.php

@@ -268,7 +268,7 @@ class GoodsModel extends \DAO\AbstractModel {
         }
         if($fromCart){
             $sql = \Our\Common::format(' goods_commonid in ({0})',implode(',',$goodsCommonIds));
-            $field = 'goods_commonid,goods_id,goods_storage,goods_state,goods_verify,is_transport,transport_id,gc_id,gc_id_1,gc_id_2,gc_id_3,snapshot_id,goods_image,goods_freight,goods_free';
+            $field = 'goods_commonid,goods_id,goods_storage,goods_state,goods_verify,is_transport,transport_id,gc_id,gc_id_1,gc_id_2,gc_id_3,snapshot_id,goods_image,goods_freight,goods_free,delivery_template_id';
         }else if($noRedisGoodsCommonIds){
             $sql = \Our\Common::format(' goods_commonid in ({0})',implode(',',$noRedisGoodsCommonIds));
             $field = 'goods_commonid,goods_id,goods_storage,goods_state,goods_verify';

application/models/Error/CodeConfig.php

@@ -127,6 +127,9 @@ class CodeConfigModel
     const emptyStoreId = 40007;
     const saveReportError = 40008;
     const stroeReceiveError = 40009;
+    const emptyScanStoreId = 40010;
+    const emptyScanStoreInfo = 40011;
+    const saveScanStoreInfoFailed = 40012;
 
     //购物车
     const wrongCartType = 50001;
@@ -530,6 +533,9 @@ class CodeConfigModel
             self::emptyReportStoreType => '举报类型不能为空',
             self::emptyStores => '没找到相关店铺',
             self::stroeReceiveError => '店铺接单错误',
+            self::emptyScanStoreId => '扫码关注店铺ID为空',
+            self::emptyScanStoreInfo => '扫码关注店铺不存在',
+            self::saveScanStoreInfoFailed => '扫码店铺保存失败',
 
             //购物车相关
             self::wrongCartType => '加入购物车类型不能为空',

conf/application.ini

@@ -395,7 +395,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyztest : common]
+[lyz : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"
@@ -442,7 +442,7 @@ elastic.master.host="192.168.1.201"
 elastic.master.port="9200"
 elastic.master.scheme="http";
 
-[lyz : common]
+[lyztest : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"