From 04ed450c97c35937f9d2ac52ffad48287f0a58b9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Mar 2021 15:04:54 +0800
Subject: [PATCH] 20210321 后台数据查询修改
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java | 2 ++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 17 +++++++++++++++++
src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 12 ++++++------
3 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
index bdb624a..f30c206 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberCoinChargeEntity.java
@@ -67,5 +67,7 @@
*/
@TableField(exist = false)
private String isTest;
+ @TableField(exist = false)
+ private String inviteId;
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 7d99aa1..d91db61 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -400,6 +400,23 @@
@Override
public IPage<MemberCoinChargeVo> findMemberApplyCoinListInPage(MemberCoinChargeEntity memberCoinChargeEntity,
QueryRequest request) {
+ //查询条件 查询某条线下的所有数据
+ String account = memberCoinChargeEntity.getAccount();
+ //如果account为空，查询全部，account不为空查询对应的memberEntity
+ if(StrUtil.isNotEmpty(account)) {
+ MemberEntity selectMemberByAccount = memberMapper.selectMemberByAccount(account);
+ String inviteId = selectMemberByAccount.getInviteId();
+ Long id = selectMemberByAccount.getId();
+ memberCoinChargeEntity.setMemberId(id);
+ memberCoinChargeEntity.setInviteId(inviteId);
+ }else {
+ MemberEntity memberEntity = memberMapper.selectMemberByAccount(MemberEntity.SYSTEM_REFERER);
+ String inviteId = memberEntity.getInviteId();
+ Long id = memberEntity.getId();
+ memberCoinChargeEntity.setMemberId(id);
+ memberCoinChargeEntity.setInviteId(inviteId);
+ }
+
Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberCoinChargeVo> findmemberQuickBuySaleListInPage = memberCoinChargeMapper.findMemberApplyCoinListInPage(page, memberCoinChargeEntity);
List<MemberCoinChargeVo> records = findmemberQuickBuySaleListInPage.getRecords();
diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
index ccc63b3..8ce98cc 100644
--- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
@@ -81,15 +81,15 @@
<select id="findMemberApplyCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo">
select * from member_coin_charge s left join member m on m.id = s.member_id
<where>
+ s.member_id in (select id from member a where
+ ( FIND_IN_SET(#{record.inviteId}, a.referer_ids) or a.id = #{record.memberId} )
+ <if test="record.isTest != null and record.isTest != '' ">
+ and a.account_type = #{record.isTest}
+ </if>
+ )
<if test="record != null" >
- <if test="record.account!=null and record.account!=''">
- and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
- </if>
<if test="record.address!=null and record.address!=''">
and s.address=#{record.address}
- </if>
- <if test="record.isTest!=null and record.isTest!=''">
- and m.account_type= #{record.isTest}
</if>
</if>
</where>
--
Gitblit v1.9.1