angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'refs/remotes/origin/dev' into test

This commit is contained in:
sangelxiu1 2025-06-18 16:59:56 +08:00
parent 4da0791b78 164a336558
commit 953b682f52
2 changed files with 109 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java
View File

@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
@Slf4j
public class TransactionUtils implements InitializingBean {
private static RedisService redisService;
// private static RedisService redisService;
/**
* 获取国际化翻译内容
@ -29,22 +29,22 @@ public class TransactionUtils implements InitializingBean {
* @return
*/
public static String getContent(String key, Object... args) {
try {
// 获取对应语言
ELanguages language = ELanguages.getLanguagesByLocal(LocaleContextHolder.getLocale().toLanguageTag());
if (null != language) {
String str = redisService.getCacheMapValue(CacheConstants.LANGUAGE_KEY + language.getLocal(), key);
if (StringUtils.isNotEmpty(str)) {
if (args.length != 0) {
str = String.format(str, args);
}
return str;
}
}
log.warn("国际化翻译工具: 翻译键不存在或缓存不存在! key: {}", key);
} catch (Exception e) {
log.error("国际化翻译工具异常! key: {}", key, e);
}
// try {
// // 获取对应语言
// ELanguages language = ELanguages.getLanguagesByLocal(LocaleContextHolder.getLocale().toLanguageTag());
// if (null != language) {
// String str = redisService.getCacheMapValue(CacheConstants.LANGUAGE_KEY + language.getLocal(), key);
// if (StringUtils.isNotEmpty(str)) {
// if (args.length != 0) {
// str = String.format(str, args);
// }
// return str;
// }
// }
// log.warn("国际化翻译工具: 翻译键不存在或缓存不存在! key: {}", key);
// } catch (Exception e) {
// log.error("国际化翻译工具异常! key: {}", key, e);
// }
if (args.length != 0) {
return String.format(key, args);
}
@ -53,7 +53,7 @@ public class TransactionUtils implements InitializingBean {
@Override
public void afterPropertiesSet() {
redisService = SpringUtils.getBean(RedisService.class);
// redisService = SpringUtils.getBean(RedisService.class);
}
}

25
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java
View File

@ -1,11 +1,7 @@
package com.hzs.common.core.constant.msg;
/**
* @Description: 财务模块词条
* @Author: ljc
* @Time: 2022/11/3 15:37
* @Classname: FinanceMsgConstants
* @Package_name: com.hzs.common.core.constant.msg
* 财务模块词条
*/
public class FinanceMsgConstants {
/**
@ -146,7 +142,7 @@ public static final String BALANCE_SUMMARY_DETAILS_EXPORT = "余额汇总详情"
/**
* 余额汇总导出 -- 余额汇总导出
*/
public static final String BALANCE_SUMMARY_EXPORT = "MSG_FINANCE_0333";
public static final String BALANCE_SUMMARY_EXPORT = "余额汇总导出";
/**
* 该会员的账户信息不存在 -- 该会员的账户信息不存在
*/
@ -297,16 +293,6 @@ public static final String CANNOT_GREATER_MAXIMUM_TRANSFER_AMOUNT = "转账金
*/
public static final String NOT_ALLOWED_TRANSFER = "该账号不允许转账";
/**
* 会员账号不允许转账（结算等级为1） -- 会员级别不允许转账
*/
public static final String MEMBER_IN_NOT_ALLOWED_TRANSFER = "会员级别不允许转账";
/**
* 会员账号不允许转账（结算等级为1） -- 会员级别不允许接收转账
*/
public static final String MEMBER_OUt_NOT_ALLOWED_TRANSFER = "MSG_FINANCE_064";
/**
* 请先实名认证 -- 请先实名认证
*/
@ -325,10 +311,6 @@ public static final String TRANSFER_IN_USER_NOT_EXIST = "转入方会员不存
* 不能给自己转账 -- 不能给自己转账
*/
public static final String NOT_TRANSFER_MONEY_TO_YOURSELF = "不能给自己转账";
/**
* 不能跨国转账 -- 不能跨国转账
*/
public static final String NOT_ALLOWED_CROSS_BORDER_TRANSFER = "不能跨国转账";
/**
* 接收方编号不在血缘线中 -- 接收方编号不在血缘线中
*/
@ -465,7 +447,7 @@ public static final String BUSINESS_LICENSE_REFUSE_RESET = "营业执照审核
/**
* 提现正在审批中，请稍后再试 -- 提现正在审批中，请稍后再试
*/
public static final String WITHDRAWAL_APPROVAL = "MSG_FINANCE_105";
public static final String WITHDRAWAL_APPROVAL = "提现正在审批中，请稍后再试";
/**
* 提现金额必须为100的整数倍
@ -503,7 +485,6 @@ public static final String BUSINESS_LICENSE_REFUSE_RESET = "营业执照审核
public static final String TRANSFER_IN_USER_NOT_ALLOWED = "账号异常无法接受转账";
/**
* 有效期截止时间应大于有效期开始时间
*/