From c366789c8192bdf6f3abd7a21f9598d40ecf73f8 Mon Sep 17 00:00:00 2001
From: zhuchunshu <zhuchunshu999@gmail.com>
Date: Wed, 13 Dec 2023 17:55:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=B0=8F=E4=BA=8E1=E5=85=83=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=8F=91=E8=B5=B7=E6=94=AF=E4=BB=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Plugins/Core/src/Lib/Pay/Service/WechatPay.php  | 7 ++++---
 app/Plugins/User/src/Controller/AssetController.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Plugins/Core/src/Lib/Pay/Service/WechatPay.php b/app/Plugins/Core/src/Lib/Pay/Service/WechatPay.php
index 2f7a36fe9..25dedb884 100644
--- a/app/Plugins/Core/src/Lib/Pay/Service/WechatPay.php
+++ b/app/Plugins/Core/src/Lib/Pay/Service/WechatPay.php
@@ -14,15 +14,16 @@ class WechatPay implements PayInterFace
      * @var int | float
      */
     private int|float $amount_multiple = 100;
+
     /**
      * 计算实际金额
-     * @param string|int $amount
+     * @param string|int|float $amount
      * @param bool $dividing
      * @return float|int
      */
-    protected function calculate_amount(string|int $amount, bool $dividing = false) : float|int
+    protected function calculate_amount(string|int|float $amount, bool $dividing = false) : float|int
     {
-        if (!is_numeric($amount)) {
+        if (!is_numeric($amount) && is_float($amount)) {
             return 0;
         }
         if ($dividing === true) {
diff --git a/app/Plugins/User/src/Controller/AssetController.php b/app/Plugins/User/src/Controller/AssetController.php
index c39d691ba..b38c8f09a 100644
--- a/app/Plugins/User/src/Controller/AssetController.php
+++ b/app/Plugins/User/src/Controller/AssetController.php
@@ -38,7 +38,7 @@ public function money()
     public function money_recharge_submit()
     {
         $payment = request()->input('payment');
-        $amount = request()->input('amount');
+        $amount = (float) request()->input('amount');
         $captcha = request()->input('captcha');
         if (!$payment || !$amount || !$captcha) {
             return Json_Api(403, false, ['msg' => '请求参数不足']);