From c5a8aafa621895d601365ff717be67d561bf0bc4 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 27 Sep 2023 20:16:15 +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/store/merchant/Merchant.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 17728995..c421199d 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -268,7 +268,8 @@ class Merchant extends BaseController
         if(empty($merchantInfo)){
             return app('json')->fail('参数错误');
         }
-        $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
+        $margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin');
+        $merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin']);
         return app('json')->success($merchantInfo);
     }