From 8375dde9106fc55f8ed4268e6db7c5122aa05146 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 19 Aug 2024 17:33:30 +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

---
 .../com/bweb/controller/BsMerchantAccountController.java  | 8 +++++---
 .../java/com/hfkj/dao/BsMerchantAccountMapperExt.java     | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bweb/src/main/java/com/bweb/controller/BsMerchantAccountController.java b/bweb/src/main/java/com/bweb/controller/BsMerchantAccountController.java
index 6dcf17b..276f1cd 100644
--- a/bweb/src/main/java/com/bweb/controller/BsMerchantAccountController.java
+++ b/bweb/src/main/java/com/bweb/controller/BsMerchantAccountController.java
@@ -125,6 +125,7 @@ public class BsMerchantAccountController {
             param.put("provinceCode", provinceCode);
             param.put("cityCode", cityCode);
             param.put("areaCode", areaCode);
+            param.put("chainBrandIdIsNull", true);
 
             PageHelper.startPage(pageNum,pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(merchantAccountService.getMerList(param)));
@@ -148,9 +149,9 @@ public class BsMerchantAccountController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户");
             }
             Map<String,Object> param = new HashMap<>();
-
+            param.put("merNo", merNo);
             PageHelper.startPage(pageNum,pageSize);
-            if (merchant.getChainBrandId() != null && merchant.getChainBrandSettleType().equals(MerchantChainBrandSettleTypeEnum.type1.getNumber())) {
+          /*  if (merchant.getChainBrandId() != null && merchant.getChainBrandSettleType().equals(MerchantChainBrandSettleTypeEnum.type1.getNumber())) {
                 // 连锁额度账户
                 BsMerchantChainBrandAccount brandAccount = merchantChainBrandAccountService.getAccount(merchant.getChainBrandId());
                 param.put("merChainBrandAccountId", brandAccount.getId());
@@ -159,7 +160,8 @@ public class BsMerchantAccountController {
             } else {
                 param.put("merNo", merNo);
                 return ResponseMsgUtil.success(new PageInfo<>(merchantAccountRecordService.getList(param)));
-            }
+            }*/
+            return ResponseMsgUtil.success(new PageInfo<>(merchantAccountRecordService.getList(param)));
 
         } catch (Exception e) {
             log.error("BsMerchantAccountController --> getRecordList() error!", e);
diff --git a/service/src/main/java/com/hfkj/dao/BsMerchantAccountMapperExt.java b/service/src/main/java/com/hfkj/dao/BsMerchantAccountMapperExt.java
index 79bff97..c8a5c34 100644
--- a/service/src/main/java/com/hfkj/dao/BsMerchantAccountMapperExt.java
+++ b/service/src/main/java/com/hfkj/dao/BsMerchantAccountMapperExt.java
@@ -32,6 +32,7 @@ public interface BsMerchantAccountMapperExt {
             " bs_merchant_account a" +
             " LEFT JOIN bs_merchant b ON a.mer_no = b.mer_no" +
             " where 1 = 1" +
+            " <if test='param.chainBrandIdIsNull != null'> and b.chain_brand_id is null </if>" +
             " <if test='param.provinceCode != null'> and b.province_code = #{param.provinceCode} </if>" +
             " <if test='param.cityCode != null'> and b.city_code = #{param.cityCode} </if>" +
             " <if test='param.areaCode != null'> and b.area_code = #{param.areaCode} </if>" +