From 88d0062538fa813f383372fb8ea05219d3947b12 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Aug 2023 11:33:57 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/templates/febs/views/dapp/member.html | 1 +
src/main/java/cc/mrbird/febs/dapp/mapper/MemberCoinWithdrawDao.java | 4 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 4 ++++
src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml | 9 +++++++++
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java | 4 ++++
5 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
index 6b40952..92f88f8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -140,4 +140,8 @@
@TableField(exist = false)
private BigDecimal myTeamAchieve;
+ @ApiModelProperty(value = "累计提现")
+ @TableField(exist = false)
+ private BigDecimal withdrawAmount;
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/MemberCoinWithdrawDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/MemberCoinWithdrawDao.java
index a2bd3c2..101d2bd 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/MemberCoinWithdrawDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/MemberCoinWithdrawDao.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
+
public interface MemberCoinWithdrawDao extends BaseMapper<MemberCoinWithdrawEntity> {
IPage<AdminMemberCoinWithdrawVo> findMemberWithdrawCoinInPage(Page<MemberCoinWithdrawEntity> page, @Param("record")MemberCoinWithdrawEntity memberCoinWithdrawEntity);
@@ -14,4 +16,6 @@
Integer selectByMemberIdAndCreateTime(@Param("memberId")Long memberIdOut, @Param("createTime")String createTime, @Param("type")String type);
MemberCoinWithdrawEntity selectByFlowId(@Param("memberId")Long memberId,@Param("flowId")Long id);
+
+ BigDecimal selectByMemberIdAndStatus(@Param("memberId")Long memberId, @Param("status")Integer status);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index dcdc5eb..6cb3dc4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -72,6 +72,7 @@
private final MallGoodsCategoryMapper mallGoodsCategoryMapper;
private final PlatformBannerMapper platformBannerMapper;
private final MallGoodsImagesMapper goodsImagesMapper;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -229,6 +230,9 @@
BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(memberEntity.getInviteId());
memberEntity.setMyTeamAchieve(totalIncomeMember);
+
+ BigDecimal withdrawAmount = memberCoinWithdrawDao.selectByMemberIdAndStatus(memberId, MemberCoinWithdrawEntity.STATUS_YES);
+ memberEntity.setWithdrawAmount(withdrawAmount);
}
}
return dappMemberEntityIPage;
diff --git a/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml b/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
index 8d5c9f1..b325363 100644
--- a/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
+++ b/src/main/resources/mapper/dapp/MemberCoinWithdrawMapper.xml
@@ -46,4 +46,13 @@
and a.flow_id = #{flowId}
</select>
+ <select id="selectByMemberIdAndStatus" resultType="java.math.BigDecimal">
+ SELECT
+ IFNULL(sum(IFNULL(a.amount, 0)),0)
+ FROM
+ member_coin_withdraw a
+ where a.member_id = #{memberId}
+ and a.status = #{status}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index d556964..7fc84e9 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -180,6 +180,7 @@
{field: 'coinAmount', title: '余额', minWidth: 130},
{field: 'scoreAmount', title: '赠送积分', minWidth: 130},
{field: 'balance', title: '资产包', minWidth: 130},
+ {field: 'withdrawAmount', title: '累计提现', minWidth: 130},
{field: 'myTeamAchieve', title: '团队业绩', minWidth: 130},
{field: 'myShareAchieve', title: '共享业绩', minWidth: 130},
{field: 'activeStatus', title: '是否激活', templet:'#switchActiveStatus', minWidth: 120},
--
Gitblit v1.9.1