From 98652ccb1d85276774052a1864a9589a31a6b13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Thu, 26 Feb 2026 07:23:29 +0000 Subject: [PATCH] Merge #45 into master from cc_20260226_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:建店资料查询收款银行信息区分品牌 * cc_20260226_fix: (2 commits squashed) - fix:建店资料查询收款银行信息区分品牌 - fix:sql缺失 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/45 --- .../src/main/resources/mapper/QualificationsInfoMapper.xml | 1 + .../cool/store/service/impl/BuildInformationServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml index 71e618fe1..0c6090e6b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/QualificationsInfoMapper.xml @@ -82,6 +82,7 @@ financial_manager_name, financial_manager_mobile, business_license, + unified_social_credit_code, electronic_email, info_source, other_remark, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 800a67cde..cf4342303 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -256,7 +256,10 @@ public class BuildInformationServiceImpl implements BuildInformationService { response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType()); } if (StringUtils.isBlank(response.getReceivingFirmName())) { - String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO); + String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":" + shopInfo.getFranchiseBrand()); + if (StringUtils.isBlank(bankInfoStr)) { + bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":1"); + } if (StringUtils.isNotBlank(bankInfoStr)) { JSONObject bankInfo = JSONObject.parseObject(bankInfoStr); response.setReceivingFirmName(bankInfo.getString("receivingFirmName"));