From 9d327bcaad5ef9e09efc3fcc708ca73b7e9f25de Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 1 Aug 2024 17:29:28 +0800
Subject: [PATCH] 1

---
 .../controller/BigwheelController.class.php   | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/webapp/controller/BigwheelController.class.php b/webapp/controller/BigwheelController.class.php
index 366c6b76..b0f24a10 100644
--- a/webapp/controller/BigwheelController.class.php
+++ b/webapp/controller/BigwheelController.class.php
@@ -88,24 +88,26 @@ class BigwheelController extends BaseAuthedController {
         mt\Bigwheel::traverseMeta(
             function ($meta) use(&$data, &$item1Hash, &$item2Hash, &$item1Arr, &$item2Arr) {
                 $gridRef = null;
-                $this->getGridRefByGridId($data, $meta['id'], $girdRef);
-                switch ($meta['Wheel_type']) {
-                case 1:{
-                    $item1Hash[$meta['id']] = $meta;
-                    array_push($item1Arr, array(
-                        'weight' => 0,
-                        'meta' => $meta
-                    ));
-                }
-                break;
-                case 2:{
-                    $item2Hash[$meta['id']] = $meta;
-                    array_push($item2Arr, array(
-                        'weight' => 0,
-                        'meta' => $meta
-                    ));
-                }
-                break;
+                $this->getGridRefByGridId($data, $meta['id'], $gridRef);
+                if (empty($gridRef)) {
+                    switch ($meta['Wheel_type']) {
+                    case 1:{
+                        $item1Hash[$meta['id']] = $meta;
+                        array_push($item1Arr, array(
+                            'weight' => 0,
+                            'meta' => $meta
+                        ));
+                    }
+                    break;
+                    case 2:{
+                        $item2Hash[$meta['id']] = $meta;
+                        array_push($item2Arr, array(
+                            'weight' => 0,
+                            'meta' => $meta
+                        ));
+                    }
+                    break;
+                    }
                 }
                 return true;
             });
@@ -141,7 +143,7 @@ class BigwheelController extends BaseAuthedController {
         {
             $rnd = rand(0, $randSpace1 - 1);
             foreach ($item1Arr as $item) {
-                if ($item['weight'] <= $rnd) {
+                if ($rnd <= $item['weight']) {
                     $item1 = $item;
                     break;
                 }
@@ -151,7 +153,7 @@ class BigwheelController extends BaseAuthedController {
         {
             $rnd = rand(0, $randSpace2 - 2);
             foreach ($item2Arr as $item) {
-                if ($item['weight'] <= $rnd) {
+                if ($rnd <= $item['weight']) {
                     $item2 = $item;
                     break;
                 }