diff --git a/app/Controller/NotifyController.php b/app/Controller/NotifyController.php index c762745..9f47c82 100644 --- a/app/Controller/NotifyController.php +++ b/app/Controller/NotifyController.php @@ -322,7 +322,7 @@ class NotifyController extends BaseController ]; $needAward = true; } else { - $isStoreFirstOrderToday = $this->userService->isStoreFirstOrderToday($orderItem['user_id'],$orderItem['store_id'],$orderItem['id']); + $isStoreFirstOrderToday = $this->userService->isStoreFirstOrderToday($orderItem['user_id'],$orderItem['store_id'],$orderItem['id'], self::AWARD_LIMIT_AMOUNT); if ($isStoreFirstOrderToday && $orderItem['money'] >= self::AWARD_LIMIT_AMOUNT) { $awardAmount = SystemConfig::query()->where(['type' => 1, 'menu_name' => 'award_each_order'])->value('value'); // 流水 diff --git a/app/Service/UserService.php b/app/Service/UserService.php index 8f43371..b5cc5fb 100644 --- a/app/Service/UserService.php +++ b/app/Service/UserService.php @@ -65,13 +65,14 @@ class UserService implements UserServiceInterface /** * @inheritDoc */ - public function isStoreFirstOrderToday($user_id, $store_id, $current_order_id) + public function isStoreFirstOrderToday($user_id, $store_id, $current_order_id, $limit_amount = 3) { return !Order::query() ->where(['user_id' => $user_id, 'store_id' => $store_id]) ->whereIn('dm_state', [OrderMain::ORDER_STATE_UNTAKE,OrderMain::ORDER_STATE_DELIVERY]) ->where('time_add', '>=', date('Y-m-d 00:00:00')) ->where('time_add', '<=', date('Y-m-d 23:59:59')) + ->where('money', '>=', $limit_amount) ->where('id', '!=', $current_order_id) ->exists(); } diff --git a/app/Service/UserServiceInterface.php b/app/Service/UserServiceInterface.php index 8742ce9..2920d53 100644 --- a/app/Service/UserServiceInterface.php +++ b/app/Service/UserServiceInterface.php @@ -24,6 +24,6 @@ interface UserServiceInterface * @param int $limit_amount * @return mixed */ - public function isStoreFirstOrderToday($user_id, $store_id, $current_order_id); + public function isStoreFirstOrderToday($user_id, $store_id, $current_order_id, $limit_amount = 3); } \ No newline at end of file