suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #55 into master from cc_20260311_optimize

Browse Source 
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/55
This commit is contained in:
王非凡
2026-03-11 09:51:45 +00:00
committed by 正新
parent 4371d9147c
commit b9690590bf
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -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";
/**
* 十二分导入锁

12
coolstore-partner-service/src/main/java/com/cool/store/service/fees/impl/PayeeBankConfigServiceImpl.java
View File

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

2
coolstore-partner-service/src/main/java/com/cool/store/service/wallet/impl/WalletServiceImpl.java
View File

@@ -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())