From b9690590bf75611907b39631d39973eaf41e1cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Wed, 11 Mar 2026 09:51:45 +0000 Subject: [PATCH] Merge #55 into master from cc_20260311_optimize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:线下收款银行配置默认值；钱包账户别名修改 * cc_20260311_optimize: (5 commits squashed) - fix:未分配招商区域处理 - fix - fix:线下收款银行配置默认值 - Merge branch 'master' into cc_20260311_optimize # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java - fix:账户别称修改 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/55 --- .../java/com/cool/store/constants/RedisConstant.java | 5 +++++ .../fees/impl/PayeeBankConfigServiceImpl.java | 12 ++++++------ .../store/service/wallet/impl/WalletServiceImpl.java | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index 81b296147..7bbb03f77 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -341,6 +341,11 @@ public class RedisConstant { * 建店资料总部订货收款账户信息 */ public static final String BUILD_RECEIVE_BANK_INFO = "zxjp_build_receive_bank_info"; + + /** + * 加盟线下收款银行默认配置 + */ + public static final String PAYEE_BANK_CONFIG_DEFAULT = "payee_bank_config_default"; /** * 十二分导入锁 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java index c18183f2c..1452c4226 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java @@ -110,17 +110,17 @@ public class PayeeBankConfigServiceImpl implements PayeeBankConfigService { } public PayeeBankConfigVO getDefaultBankConfig(String franchiseBrand) { - String bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":" + franchiseBrand); + String bankInfoStr = redisUtilPool.hashGet(RedisConstant.PAYEE_BANK_CONFIG_DEFAULT, franchiseBrand); if (StringUtils.isBlank(bankInfoStr)) { - bankInfoStr = redisUtilPool.getString(RedisConstant.BUILD_RECEIVE_BANK_INFO + ":1"); + bankInfoStr = redisUtilPool.hashGet(RedisConstant.PAYEE_BANK_CONFIG_DEFAULT, "1"); } if (StringUtils.isNotBlank(bankInfoStr)) { JSONObject bankInfo = JSONObject.parseObject(bankInfoStr); return PayeeBankConfigVO.builder() - .payeeName(bankInfo.getString("receivingFirmName")) - .payeeAccount(bankInfo.getString("receivingMsBankAccount")) -// .payeeBank() - .payeeBankBranch(bankInfo.getString("receivingMsBankBranch")) + .payeeName(bankInfo.getString("payeeName")) + .payeeAccount(bankInfo.getString("payeeAccount")) + .payeeBank(bankInfo.getString("payeeBank")) + .payeeBankBranch(bankInfo.getString("payeeBankBranch")) .build(); } return null; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java index d76f87547..44c51428a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java @@ -105,7 +105,7 @@ public class WalletServiceImpl implements WalletService { .businessType(BankBusinessTypeEnum.PERSONAL.getType()) .legalName(request.getUserName()) .legalNo(request.getIdCardNo()) - .accountAliasName(request.getUserName() + "_" + shopInfo.getStoreId()) + .accountAliasName(request.getUserName() + "_" + UUIDUtils.get8UUID()) .accountCardNo(request.getBankNumber()) .accountPhone(request.getBankMobile()) .bankNo(request.getBankNo())