From 0a250f33c02f1e1b552daba2c0acce56b8222e1e Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 1 Jun 2023 11:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/admin/system/merchant/Merchant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/admin/system/merchant/Merchant.php b/app/controller/admin/system/merchant/Merchant.php
index 14dbbc9d..4435efbc 100644
--- a/app/controller/admin/system/merchant/Merchant.php
+++ b/app/controller/admin/system/merchant/Merchant.php
@@ -146,7 +146,7 @@ class Merchant extends BaseController
         unset($data['mer_account'], $data['mer_password']);
         $margin = $this->repository->checkMargin($id, $data['type_id']);
         $data['margin'] = $margin['margin'];
-        $data['is_margin'] = $margin['is_margin'];
+        $data['is_margin'] = $data['paid_margin'] > 0 ? MerchantRepository::PaidMargin : $margin['is_margin'];
         $data['ot_margin'] = $data['paid_margin'];
         $datas=$data;
         $this->repository->update($id, $datas);