angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 账户列表显示国际化处理；

This commit is contained in:
cabbage 2025-05-08 17:28:49 +08:00
parent 293ad61b32
commit 7179cf81b7
2 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java
View File

@ -40,9 +40,7 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* <p>
* 会员交易明细 服务实现类 * 会员交易明细 服务实现类
* </p>
* *
* @author hzs * @author hzs
* @since 2022-09-06 * @since 2022-09-06
@ -202,7 +200,7 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
Integer pkCountry = businessCommissionDTO.getPkCountry(); Integer pkCountry = businessCommissionDTO.getPkCountry();
if (null != pkCountry) { if (null != pkCountry) {
Integer accountValue = cuMemberBaseService.getAccountValueById(businessCommissionDTO.getPkAccount()); Integer accountValue = cuMemberBaseService.getAccountValueById(businessCommissionDTO.getPkAccount());
if(accountValue.equals(EAccount.BONUS.getValue())){ if (accountValue.equals(EAccount.BONUS.getValue())) {
isWithdraw = 0; isWithdraw = 0;
} }
return cuMemberAccountService.batchUpdateMemberAccountByPkmember( return cuMemberAccountService.batchUpdateMemberAccountByPkmember(
@ -729,11 +727,10 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
Page<CuMemberTradeExt> cuMemberTrades = (Page<CuMemberTradeExt>) baseMapper.selectWattleDetail(cuMemberTradeVO); Page<CuMemberTradeExt> cuMemberTrades = (Page<CuMemberTradeExt>) baseMapper.selectWattleDetail(cuMemberTradeVO);
if (CollUtil.isNotEmpty(cuMemberTrades)) { if (CollUtil.isNotEmpty(cuMemberTrades)) {
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values());
Map<Integer, Integer> accountTranValue = this.getTranslateAccountValue(pkCountry); Map<Integer, String> accountTranValue = this.getTranslateAccountValue(pkCountry);
for (CuMemberTradeExt memberTrade : cuMemberTrades) { for (CuMemberTradeExt memberTrade : cuMemberTrades) {
memberTradeVO = BeanUtil.copyProperties(memberTrade, CuMemberTradeVO.class); memberTradeVO = BeanUtil.copyProperties(memberTrade, CuMemberTradeVO.class);
Integer pkAccount = memberTradeVO.getPkAccount(); memberTradeVO.setPkAccountVal(accountTranValue.get(memberTradeVO.getPkAccount()));
memberTradeVO.setPkAccount(accountTranValue.get(pkAccount));
//转化备注 //转化备注
String remarks = memberTradeVO.getRemarks(); String remarks = memberTradeVO.getRemarks();
if (StringUtils.isNotEmpty(remarks) && remarks.startsWith(EnumsPrefixConstants.TRADE_TYPE)) { if (StringUtils.isNotEmpty(remarks) && remarks.startsWith(EnumsPrefixConstants.TRADE_TYPE)) {
@ -760,9 +757,9 @@ public class CuMemberTradeServiceImpl extends ServiceImpl<CuMemberTradeMapper, C
* @param pkCountry 国家 * @param pkCountry 国家
* @return Map<Integer, Integer> * @return Map<Integer, Integer>
*/ */
private Map<Integer, Integer> getTranslateAccountValue(Integer pkCountry) { private Map<Integer, String> getTranslateAccountValue(Integer pkCountry) {
List<BdAccount> accountList = cuMemberBaseService.getAccountByCountry(null, pkCountry); List<BdAccount> accountList = cuMemberBaseService.getAccountByCountry(null, pkCountry);
return accountList.stream().collect(Collectors.toMap(BdAccount::getPkId, BdAccount::getPkTransactionKey)); return accountList.stream().collect(Collectors.toMap(BdAccount::getPkId, BdAccount::getAccountName));
} }

10
bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml
View File

@ -196,8 +196,8 @@
select distinct t.trade_type select distinct t.trade_type
from cu_member_trade t from cu_member_trade t
where t.del_flag = 0 where t.del_flag = 0
and t.pk_country =#{pkCountry} and t.pk_country = #{pkCountry}
and t.pk_member= #{pkMember} and t.pk_member = #{pkMember}
order by t.trade_type order by t.trade_type
</select> </select>
@ -279,11 +279,12 @@
group by cmt.trade_classify, cmt.pk_account) group by cmt.trade_classify, cmt.pk_account)
</select> </select>
<select id="batchQueryCuMemberTradeSeq" resultType="java.lang.Long"> <select id="batchQueryCuMemberTradeSeq" resultType="java.lang.Long">
select cu_member_trade_seq.nextval from dual connect by rownum &lt;= #{rowNum} select cu_member_trade_seq.nextval
from dual connect by rownum &lt;= #{rowNum}
</select> </select>
<select id="selectMemberTradeBySourceCode" resultMap="CuMemberTrade" > <select id="selectMemberTradeBySourceCode" resultMap="CuMemberTrade">
select * select *
from cu_member_trade t from cu_member_trade t
left join bd_account a left join bd_account a
@ -295,5 +296,4 @@
</select> </select>
</mapper> </mapper>