From ac3593404a3c52fc63e56c1e42d917016189058b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 27 Sep 2023 20:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 09b4bd94..82874a11 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -281,14 +281,20 @@ class Auth extends BaseController
             return app('json')->fail('用户店铺异常');
         }
         if($merchant['margin'] == 0){
-            return app('json')->fail('当前金额为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;
         }
         $orderSn = "bzj" . date('YmdHis') . uniqid();
         Db::name('margin_order')->insert([
             'uid' => $user['uid'],
             'mer_id' => $merchant['mer_id'],
             'order_sn' => $orderSn,
-            'total_price' => $merchant['margin'],
+            'total_price' => $margin,
             'pay_type' => 1,
             'create_time' => date('Y-m-d H:i:s')
         ]);
@@ -298,10 +304,10 @@ class Auth extends BaseController
             "mer_id" => $merchant['mer_id'],
             "pay_type" => 1,
             "attach" => "margin",
-            "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
-            "pay_price" => $merchant['margin'],
+            "order_info" => '{"is_margin":1,"margin":"' . $margin . '"}',
+            "pay_price" => $margin,
             "order_sn" => $orderSn,
-            "body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
+            "body" => $merchant['mer_name'] . ' - ' . $margin,
         ];
         $payType = 'weixinApp';
         $service = new PayService($payType, $param);