diff --git a/app/common/dao/store/StoreActivityDao.php b/app/common/dao/store/StoreActivityDao.php index 3b6361fc..0c6b973e 100755 --- a/app/common/dao/store/StoreActivityDao.php +++ b/app/common/dao/store/StoreActivityDao.php @@ -55,8 +55,9 @@ class StoreActivityDao extends BaseDao */ public function product($userId, $location, $streetCode, $activityId) { + $limit = 5; [$lat, $lng] = (new CityAreaDao())->getLngAndLat($location, $streetCode); - $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], 5); + $cloud_product_arr = (new CloudProductDao())->getByDistance($lat, $lng, ['activity_id' => $activityId], $limit); $cloud_product = []; foreach ($cloud_product_arr as $key => $value) { $cloud_product[] = $value['product_id']; @@ -74,7 +75,7 @@ class StoreActivityDao extends BaseDao } /** @var SpuRepository $spuRep */ $spuRep = app()->make(SpuRepository::class); - $products = $spuRep->getApiSearch($where, 1, 4, false, true); + $products = $spuRep->getApiSearch($where, 1, $limit, false, true); $canBuy = 1; if ($products['list']) { $list = $products['list']; diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index d96a2a66..bf82f02d 100755 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -512,7 +512,9 @@ class StoreOrderRepository extends BaseRepository $finance = (new CommissionDao())->firstOrderCommission($order, $finance, $financeSn . ($i++)); $addressCode = explode(',', $order['user_address_code']); // "惠农供销,谱写数字新篇章"活动首单分润,镇合伙人 - (new CommissionDao())->sendCommission($order, $addressCode[3], 3); + if (!empty($addressCode[3])) { + (new CommissionDao())->sendCommission($order, $addressCode[3], 3); + } } } //分销判断