From 2ae08ffc8c0903ed059b4c082244632465547e3c Mon Sep 17 00:00:00 2001
From: jcadmin <jcadmin@qq.com>
Date: Wed, 13 Nov 2024 22:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/GenerateCustomerRanking.php      | 7 +++++++
 app/Http/Controllers/Api/Customer/OrderController.php | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/GenerateCustomerRanking.php b/app/Console/Commands/GenerateCustomerRanking.php
index 84bd1689..a5f4da7b 100755
--- a/app/Console/Commands/GenerateCustomerRanking.php
+++ b/app/Console/Commands/GenerateCustomerRanking.php
@@ -126,6 +126,13 @@ class GenerateCustomerRanking extends Command
         ];
 
         if ($dayx == 7) {
+            // 最近连赢次数
+            $baseInfo['wined_last7'] = 0;
+            foreach ($orders as $item) {
+                if ($item->wined == 1) {
+                    $baseInfo['wined_last7']++;
+                }
+            }
             // 一站成名: 最后一单是红的，并且7日内有连续3天都红
             if ($lastOrder && $lastOrder->wined == 1 && $lossMax < 3 && $dayMax >= 3) {
                 $baseInfo['rank_fame'] = 1;
diff --git a/app/Http/Controllers/Api/Customer/OrderController.php b/app/Http/Controllers/Api/Customer/OrderController.php
index 52492cf1..662f44af 100755
--- a/app/Http/Controllers/Api/Customer/OrderController.php
+++ b/app/Http/Controllers/Api/Customer/OrderController.php
@@ -152,6 +152,7 @@ class OrderController extends BaseController
             ->where('cdate', date('Ymd'))
             ->where($rankType, 1)
             ->orderBy($sortField, 'desc')
+            ->orderBy('wined_last7', 'desc')
             ->limit(10)
             ->get();
 
@@ -980,7 +981,7 @@ class OrderController extends BaseController
         /** @var Order $unionOrder */
         $unionOrder = Order::sn($orderSn)->where('type', OrderType::UNION)->first();
         ThrowException::isTrue(!$unionOrder, '无效数据');
-        
+
         $earlyTime = date('Y-m-d H:i:s', strtotime($unionOrder->odds_early_close_time));
          ThrowException::isTrue(date('Y-m-d H:i:s') >= $earlyTime, '投注已截止');
         ThrowException::isTrue($unionOrder->pay_state != PayState::SUCCESS, '合买不存在');