From a0b1e6588c2fcdb7b096b7530b6153fb5a139cab Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Thu, 14 Sep 2023 16:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=82=E7=8E=87=E4=B8=8D=E8=B6=B31=20?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=97=A0=E5=A5=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/model/ZoneGoodsParam.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/model/ZoneGoodsParam.php b/app/model/ZoneGoodsParam.php
index 2db3dad..20dfe14 100644
--- a/app/model/ZoneGoodsParam.php
+++ b/app/model/ZoneGoodsParam.php
@@ -24,6 +24,7 @@ class ZoneGoodsParam extends Model
         $list = self::where($where)->field('id,amount,image,probability,awards')->order('probability')->select()->toArray();
 
         $ZoneAmountParam = [];
+        $sumProbability = 0;
         foreach ($list as &$item) {
 
             if ($item['image']) $item['image'] = get_image_url($item['image']);
@@ -33,6 +34,21 @@ class ZoneGoodsParam extends Model
                 $item['amount'] = $res['amount'];
                 $ZoneAmountParam = $res['data'];
             }
+            $sumProbability += $item['probability'];
+        }
+        # 概率未补全则自动补全 归1
+        if ($sumProbability < 1 && strpos($sumProbability,'.') !== false) {
+            for ($i = 1; $i <= 10; $i++) {
+                $residueProbability = 1 - $sumProbability;
+                $res = ZoneAmountParam::getRandAmount($ZoneAmountParam);
+                $list[] = [
+                    'id' => 0,
+                    'amount' => $res['amount'],
+                    'image' => rand_icon('icon',true),
+                    'probability' => $residueProbability / 10,
+                    'awards' => 0
+                ];
+            }
         }
         return $list;
     }