From 1b35abd03d15f74d6e0739ce22bbbce1364c2e45 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 8 Oct 2023 12:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 3df17140..336a67b4 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -285,11 +285,11 @@ class Auth extends BaseController
         if($merchant['margin'] == 0){
             $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin');
             $margin = bcsub($margin,$merchant['paid_margin'],2);
-            if($margin==0){
-                return app('json')->fail('当前金额为0,不能进行充值');
-            }
         }else{
-            $margin=0;
+            $margin=$merchant['margin'];
+        }
+        if($margin==0){
+            return app('json')->fail('当前金额为0,不能进行充值');
         }
         $orderSn = "bzj" . date('YmdHis') . uniqid();
         Db::name('margin_order')->insert([