From f7a9d0c2914b18dc3a2c85cfe9d9b0120b216e0b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 27 Sep 2023 20:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=BC=E9=87=91?=
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, 3 insertions(+)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index c421199d..826a6831 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -270,6 +270,9 @@ class Merchant extends BaseController
         }
         $margin = Db::name('MerchantType')->where('mer_type_id', $merchantInfo['type_id'])->value('margin');
         $merchantInfo['unpaid_margin'] = bcsub($margin,$merchantInfo['paid_margin']);
+        if($merchantInfo['margin']==0){
+            $merchantInfo['margin']=$merchantInfo['unpaid_margin'];
+        }
         return app('json')->success($merchantInfo);
     }