diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java index ee8952ed..253ce481 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTradeServiceImpl.java @@ -40,9 +40,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - *

* 会员交易明细 服务实现类 - *

* * @author hzs * @since 2022-09-06 @@ -202,7 +200,7 @@ public class CuMemberTradeServiceImpl extends ServiceImpl cuMemberTrades = (Page) baseMapper.selectWattleDetail(cuMemberTradeVO); if (CollUtil.isNotEmpty(cuMemberTrades)) { Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); - Map accountTranValue = this.getTranslateAccountValue(pkCountry); + Map accountTranValue = this.getTranslateAccountValue(pkCountry); for (CuMemberTradeExt memberTrade : cuMemberTrades) { memberTradeVO = BeanUtil.copyProperties(memberTrade, CuMemberTradeVO.class); - Integer pkAccount = memberTradeVO.getPkAccount(); - memberTradeVO.setPkAccount(accountTranValue.get(pkAccount)); + memberTradeVO.setPkAccountVal(accountTranValue.get(memberTradeVO.getPkAccount())); //转化备注 String remarks = memberTradeVO.getRemarks(); if (StringUtils.isNotEmpty(remarks) && remarks.startsWith(EnumsPrefixConstants.TRADE_TYPE)) { @@ -760,9 +757,9 @@ public class CuMemberTradeServiceImpl extends ServiceImpl */ - private Map getTranslateAccountValue(Integer pkCountry) { + private Map getTranslateAccountValue(Integer pkCountry) { List 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)); } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml index 6b349efa..d570711e 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberTradeMapper.xml @@ -31,15 +31,15 @@ m.member_name as memberName, v.VERTEX_NAME as vertexName, c.TEAM_NAME as teamName - from cu_member_trade t - left join cu_member m - on t.pk_member = m.pk_id - left join cu_member_team c - ON c.pk_id = m.pk_team_code - and c.del_flag = 0 - left join bd_vertex v - on v.pk_id = m.PK_VERTEX - and v.del_flag = 0 + from cu_member_trade t + left join cu_member m + on t.pk_member = m.pk_id + left join cu_member_team c + ON c.pk_id = m.pk_team_code + and c.del_flag = 0 + left join bd_vertex v + on v.pk_id = m.PK_VERTEX + and v.del_flag = 0 @@ -125,10 +125,10 @@ select min(pk_id) pk_id, pk_account,sum(trade_amount) trade_amount, max(pk_country) pk_country from cu_member_trade where pk_member = #{pkMember} and trade_classify !=4 - and source_code = #{sourceCode} - and del_flag = 0 + and source_code = #{sourceCode} + and del_flag = 0 - and trade_type not in (830, 831, 832, 833, 834) + and trade_type not in (830, 831, 832, 833, 834) group by pk_account order by pk_id @@ -159,20 +159,20 @@ - select distinct t.trade_type - from cu_member_trade t + select distinct t.trade_type + from cu_member_trade t where t.del_flag = 0 - and t.pk_country =#{pkCountry} - and t.pk_member= #{pkMember} + and t.pk_country = #{pkCountry} + and t.pk_member = #{pkMember} order by t.trade_type @@ -234,13 +234,13 @@ merge into cu_member_trade a 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, - (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 - else ca.account10 + m.trade_amount end) trade_balance, + 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 + 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, (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, - m.source_code, m.trade_statue, m.remarks, m.pk_country, m.creation_time, m.pk_creator from( + 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( 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, @@ -279,21 +279,21 @@ group by cmt.trade_classify, cmt.pk_account) - select * - from cu_member_trade t - left join bd_account a - on t.pk_account = a.pk_id - and a.del_flag = 0 - where t.del_flag = 0 - and a.field_value = 4 - and t.source_code = #{sourceCode} + from cu_member_trade t + left join bd_account a + on t.pk_account = a.pk_id + and a.del_flag = 0 + where t.del_flag = 0 + and a.field_value = 4 + and t.source_code = #{sourceCode} -