Skip to content

M
my-yaf-project
Commit a85e0f6d authored by zhz's avatar zhz
Browse files
Options

inservice

parent 1484a387
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
application/models/Business/Goods/GoodsCommonService.php
View file @ a85e0f6d
...@@ -496,12 +496,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel ...@@ -496,12 +496,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$lng = $param['lng']; $lng = $param['lng'];
$lat = $param['lat']; $lat = $param['lat'];
} }
$in_store_service_flag=0; $storeInfo = \DAO\StoreModel::getInstance()->get($commonInfo['store_id'],false);
if($lng && $lat){ $in_store_service_flag = \DAO\StoreModel::getInstance()->checkAddressInServiceArea(array('lng'=>$lng,'lat'=>$lat),$storeInfo);
$location = array('lat'=>$lat,'lng'=>$lng);
$in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$commonInfo['store_id']);
$in_store_service && $in_store_service_flag = 1;
}
//所在地 //所在地
$area = ''; $area = '';
if($commonInfo['areaid_1'] && $commonInfo['areaid_2']){ if($commonInfo['areaid_1'] && $commonInfo['areaid_2']){
......
application/models/Business/Goods/GroupSaleService.php
View file @ a85e0f6d
...@@ -38,12 +38,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel { ...@@ -38,12 +38,14 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
$lng = $param['lng']; $lng = $param['lng'];
$lat = $param['lat']; $lat = $param['lat'];
} }
$in_store_service_flag=0; // $in_store_service_flag=0;
if($lng && $lat){ // if($lng && $lat){
$location = array('lat'=>$lat,'lng'=>$lng); // $location = array('lat'=>$lat,'lng'=>$lng);
$in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$data['store_id']); // $in_store_service = \Store\StoreUtil::getInstance()->checkAddressInServiceArea($location,$data['store_id']);
$in_store_service && $in_store_service_flag = 1; // $in_store_service && $in_store_service_flag = 1;
} // }
$storeInfo = \DAO\StoreModel::getInstance()->get($data['store_id'],false);
$in_store_service_flag = \DAO\StoreModel::getInstance()->checkAddressInServiceArea(array('lng'=>$lng,'lat'=>$lat),$storeInfo);
$data['inStoreService'] = $in_store_service_flag; $data['inStoreService'] = $in_store_service_flag;
$data['state'] = \Our\ApiConst::cartGoodsOnline; $data['state'] = \Our\ApiConst::cartGoodsOnline;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment