From 2015422c5da455da408c57c4d76df3b020bb5f19 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 30 Jan 2024 17:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B4=BB=E5=8A=A8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9C=89=E6=95=88=E9=87=91=E9=A2=9D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/StoreActivityUserDao.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php
index 0c1dbd03..ad7735c3 100755
--- a/app/common/dao/store/StoreActivityUserDao.php
+++ b/app/common/dao/store/StoreActivityUserDao.php
@@ -130,11 +130,14 @@ class StoreActivityUserDao extends BaseDao
         $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray();
         $storeConsumptionUserDao = new StoreConsumptionUserDao();
         $scope = $storeConsumptionUserDao->getScope($consumption, $myOrder['pay_price']);
+        // 订单有效金额为实付金额+红包金额
+        $orderValidAmount = bcadd($myOrder['pay_price'], $myOrder['red_pack'], 2);
+        $orderValidAmount = min($orderValidAmount, $storeConsumptionUserDao->maxAmount);
         $orderQuery = StoreActivityOrder::where('spread_id', $userId)
             ->whereIn('user_id', array_column($userInfo, 'uid'))
             ->where('activity_id', $activityId)
             ->where('is_first_order', StoreActivityOrder::IS_FIRST_ORDER)
-            ->where('pay_price', '>=', $scope['start']);
+            ->where('pay_price', '>=', $orderValidAmount);
         if (!empty($groupOrderIds)) {
             unset($groupOrderIds[0]);
             $orderQuery->whereIn('group_order_id', $groupOrderIds);
@@ -144,7 +147,7 @@ class StoreActivityUserDao extends BaseDao
         $orders = $orderQuery->select()->toArray();
         $orders = reset_index($orders, 'user_id');
         foreach ($userInfo as &$user) {
-            $user['target_amount'] = $scope['start'];
+            $user['target_amount'] = $orderValidAmount;
             $user['is_finish'] = isset($orders[$user['uid']]) ? 1 : 0;
         }
         return ['target' => $scope['num'], 'allow_receive' => count($orders) >= $scope['num'], 'user_info' => $userInfo];