提交代码

cweb/src/main/java/com/cweb/controller/BsMerLedgerController.java

@@ -1,5 +1,6 @@
 package com.cweb.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hfkj.common.exception.ErrorCode;
@@ -51,6 +52,7 @@ public class BsMerLedgerController {
     @ApiOperation(value = "商户分账功能申请")
     public ResponseData merLedgerApply(@RequestBody BsMerLedger body) {
         try {
+            System.out.println("请求参数：" + JSONObject.toJSONString(body));
             if (body.getMerId() == null || body.getPlatformType() == null) {
                 log.error("BsDeviceOrderPayController -> payOrder error!","参数校验失败");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");

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);

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);
             }
         }