diff --git a/app/common/dao/store/StoreActivityDao.php b/app/common/dao/store/StoreActivityDao.php index 373965d0..3b6361fc 100755 --- a/app/common/dao/store/StoreActivityDao.php +++ b/app/common/dao/store/StoreActivityDao.php @@ -56,7 +56,7 @@ class StoreActivityDao extends BaseDao public function product($userId, $location, $streetCode, $activityId) { [$lat, $lng] = (new CityAreaDao())->getLngAndLat($location, $streetCode); - $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], 4); + $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], 5); $cloud_product = []; foreach ($cloud_product_arr as $key => $value) { $cloud_product[] = $value['product_id']; diff --git a/app/common/dao/store/product/CloudProductDao.php b/app/common/dao/store/product/CloudProductDao.php index e648bee8..13e75597 100755 --- a/app/common/dao/store/product/CloudProductDao.php +++ b/app/common/dao/store/product/CloudProductDao.php @@ -41,7 +41,7 @@ class CloudProductDao extends BaseDao { $query = CloudProduct::where('status', 1) ->where($where) - ->whereIn('store_name', ['耶贝尔柔韧布质竹纸特惠装(10包)', '家家宜除菌洗衣液阳光清香1千克', '家家宜除菌洗衣粉阳光清香1千克-New版', '家家宜柠檬高效除油洗洁精1.12千克']) + ->whereIn('store_name', ['耶贝尔柔韧布质竹纸特惠装(10包)', '家家宜除菌洗衣液阳光清香1千克', '家家宜除菌洗衣粉阳光清香1千克-New版', '家家宜柠檬高效除油洗洁精1.12千克', '蔺艺挂面1.5千克']) ->whereIn('type_id', [10, 17]) ->whereNotNull('lat') ->whereNotNull('long')