From cf287f20a80c2f06841fbbb85f6e13377bdcabf0 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 20 Jun 2023 10:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hfkj/channel/saas/SaasMerService.java    | 3 +++
 .../src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java
index a8bf849..13ff0e4 100644
--- a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java
+++ b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java
@@ -191,6 +191,9 @@ public class SaasMerService {
             feesMap = new HashMap<>();
             feesMap.put("feeCode", rate.getRateSaasTypeCode());
             feesMap.put("feeValue", rate.getRatePct());
+            if (StringUtils.isNotBlank(rate.getExt1())) {
+                feesMap.put("topFee", rate.getExt1());
+            }
             feesMapList.add(feesMap);
         }
         bizContent.put("fees", feesMapList);
diff --git a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java
index 610ad09..31929b3 100644
--- a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java
+++ b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java
@@ -243,6 +243,7 @@ public class BsMerServiceImpl implements BsMerService {
                 SecDictionary platformNoRate = commonService.mappingSysCode("MER_PLATFORM_NO_RATE", merRate.getRateTypeCode().toString());
                 merRate.setRateTypeName(platformNoRate.getCodeName());
                 merRate.setRateSaasTypeCode(platformNoRate.getExt2());
+                merRate.setExt1(platformNoRate.getExt3());
                 merRateService.editMerRate(merRate);
             }
         }