提交代码

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

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>" +