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));
} }

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

@ -31,15 +31,15 @@
m.member_name as memberName, m.member_name as memberName,
v.VERTEX_NAME as vertexName, v.VERTEX_NAME as vertexName,
c.TEAM_NAME as teamName c.TEAM_NAME as teamName
from cu_member_trade t from cu_member_trade t
left join cu_member m left join cu_member m
on t.pk_member = m.pk_id on t.pk_member = m.pk_id
left join cu_member_team c left join cu_member_team c
ON c.pk_id = m.pk_team_code ON c.pk_id = m.pk_team_code
and c.del_flag = 0 and c.del_flag = 0
left join bd_vertex v left join bd_vertex v
on v.pk_id = m.PK_VERTEX on v.pk_id = m.PK_VERTEX
and v.del_flag = 0 and v.del_flag = 0
</sql> </sql>
<sql id="ids_where"> <sql id="ids_where">
@ -125,10 +125,10 @@
select min(pk_id) pk_id, pk_account,sum(trade_amount) trade_amount, max(pk_country) pk_country select min(pk_id) pk_id, pk_account,sum(trade_amount) trade_amount, max(pk_country) pk_country
from cu_member_trade from cu_member_trade
where pk_member = #{pkMember} and trade_classify !=4 where pk_member = #{pkMember} and trade_classify !=4
and source_code = #{sourceCode} and source_code = #{sourceCode}
and del_flag = 0 and del_flag = 0
<!-- 2024.05.20 临时解决，订单业务手续费不退款 --> <!-- 2024.05.20 临时解决，订单业务手续费不退款 -->
and trade_type not in (830, 831, 832, 833, 834) and trade_type not in (830, 831, 832, 833, 834)
group by pk_account group by pk_account
order by pk_id order by pk_id
</select> </select>
@ -159,20 +159,20 @@
</insert> </insert>
<select id="selectWattleDetail" resultType="com.hzs.common.domain.member.account.CuMemberTradeExt"> <select id="selectWattleDetail" resultType="com.hzs.common.domain.member.account.CuMemberTradeExt">
select t.trade_code tradeCode, select t.trade_code tradeCode,
t.source_code sourceCode, t.source_code sourceCode,
t.pk_account pkAccount, t.pk_account pkAccount,
t.trade_type tradeType, t.trade_type tradeType,
t.trade_amount tradeAmount, t.trade_amount tradeAmount,
t.trade_balance tradeBalance, t.trade_balance tradeBalance,
t.creation_time creationTime, t.creation_time creationTime,
t.remarks remarks, t.remarks remarks,
r.member_remarks memberRemarks r.member_remarks memberRemarks
from cu_member_trade t from cu_member_trade t
left join cu_member_recharge r left join cu_member_recharge r
on t.trade_code = r.recharge_code on t.trade_code = r.recharge_code
and r.del_flag = 0 and r.del_flag = 0
and r.approve_state = 2 and r.approve_state = 2
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}
@ -193,11 +193,11 @@
<select id="selectTradeType" resultType="Integer"> <select id="selectTradeType" resultType="Integer">
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>
@ -234,13 +234,13 @@
<update id="batchInsertCuMemberTrade"> <update id="batchInsertCuMemberTrade">
merge into cu_member_trade a merge into cu_member_trade a
using ( using (
select m.pk_id, m.pk_member, m.trade_code, m.pk_account, m.trade_type,m.trade_classify, m.pk_rate, m.trade_amount, select m.pk_id, m.pk_member, m.trade_code, m.pk_account, m.trade_type,m.trade_classify, m.pk_rate, m.trade_amount,
(case when ba.field_value=4 then ca.account4 + m.trade_amount when ba.field_value=5 then ca.account5 + m.trade_amount (case when ba.field_value=4 then ca.account4 + m.trade_amount when ba.field_value=5 then ca.account5 + m.trade_amount
when ba.field_value=8 then ca.account8 + m.trade_amount when ba.field_value=9 then ca.account9 + m.trade_amount when ba.field_value=8 then ca.account8 + m.trade_amount when ba.field_value=9 then ca.account9 + m.trade_amount
else ca.account10 + m.trade_amount end) trade_balance, else ca.account10 + m.trade_amount end) trade_balance,
(case when ba.field_value=4 then ca.account4 when ba.field_value=5 then ca.account5 when ba.field_value=8 then ca.account8 (case when ba.field_value=4 then ca.account4 when ba.field_value=5 then ca.account5 when ba.field_value=8 then ca.account8
when ba.field_value=9 then ca.account9 else ca.account10 end) trade_before_balance, when ba.field_value=9 then ca.account9 else ca.account10 end) trade_before_balance,
m.source_code, m.trade_statue, m.remarks, m.pk_country, m.creation_time, m.pk_creator from( m.source_code, m.trade_statue, m.remarks, m.pk_country, m.creation_time, m.pk_creator from(
<foreach collection="cuMemberTradeList" item="item" open=" " separator=" union all " close=" "> <foreach collection="cuMemberTradeList" item="item" open=" " separator=" union all " close=" ">
select #{item.pkId} pk_id,#{item.tradeCode} trade_code, #{item.tradeClassify} trade_classify, select #{item.pkId} pk_id,#{item.tradeCode} trade_code, #{item.tradeClassify} trade_classify,
#{item.pkMember} pk_member,#{item.pkAccount} pk_account,#{item.pkRate} pk_rate,#{item.tradeAmount} trade_amount, #{item.pkMember} pk_member,#{item.pkAccount} pk_account,#{item.pkRate} pk_rate,#{item.tradeAmount} trade_amount,
@ -279,21 +279,21 @@
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
on t.pk_account = a.pk_id on t.pk_account = a.pk_id
and a.del_flag = 0 and a.del_flag = 0
where t.del_flag = 0 where t.del_flag = 0
and a.field_value = 4 and a.field_value = 4
and t.source_code = #{sourceCode} and t.source_code = #{sourceCode}
</select> </select>
</mapper> </mapper>