组合销售增加是否在服务范围内

application/controllers/Store.php

@@ -89,7 +89,8 @@ class StoreController extends \Our\Controller_AbstractIndex {
         $pageSize = $this->getPageSize(\Our\PageConst::pBlPage);
         $data['pageIndex'] = $pageIndex;
         $data['pageSize'] = $pageSize;
-        $info = \Business\Goods\GroupSaleServiceModel::getInstance()->getGroupSaleGoodsList($data);
+        $currentAddress = $this->sess->get('currentAddress');
+        $info = \Business\Goods\GroupSaleServiceModel::getInstance()->getGroupSaleGoodsList($data,$currentAddress);
         $this->success($info);
     }
 

application/models/Business/Goods/GroupSaleService.php

@@ -429,11 +429,17 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
      * @throws \Exception
      * @throws \Our\Exception
      */
-    public function getGroupSaleGoodsList($param){
+    public function getGroupSaleGoodsList($param,$address = array()){
         $storeId = (int)$param['storeId'];
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
+        if(!$address){
+            $inServiceAreaFlag = \Our\ApiConst::one;
+        }else{
+            $inAreaFlag = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($address,$storeId);
+            $inServiceAreaFlag = $inAreaFlag?\Our\ApiConst::one:\Our\ApiConst::zero;
+        }
         $pageSize = (int)$param['pageSize'];
         $pageIndex = (int)$param['pageIndex'];
         if($pageSize === 0){
@@ -488,7 +494,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         }else{
             $totalCount = 0;
         }
-        return array('totalCount'=>$totalCount,'groupGoods'=>array_values($group));
+        return array('totalCount'=>$totalCount,'groupGoods'=>array_values($group),'inServiceAreaFlag'=>$inServiceAreaFlag);
     }
 
     public function getPBundlingList($groupList,$dbName = \Our\DbNameConst::salveDBConnectName,$withKeyFlag = false){