From f975061b8a70ab47d7fde036dd1e05df69de89fa Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Jul 2020 11:59:13 +0800
Subject: [PATCH] 20200717 代码提交
---
src/main/java/com/xcong/excoin/modules/member/vo/MemberInfoDetailVo.java | 36 ++
src/main/resources/templates/febs/views/modules/member/withdrawCoin.html | 13
src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java | 309 ++++++++++++-----------
src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java | 24 +
src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java | 139 +++++-----
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 54 ++++
src/main/resources/mapper/modules/MemberMapper.xml | 112 ++++++++
src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html | 52 ++++
8 files changed, 516 insertions(+), 223 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
index 2eea428..840e6e9 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/ViewController.java
@@ -1,149 +1,160 @@
-package com.xcong.excoin.modules.member.controller;
-
-import com.xcong.excoin.common.controller.BaseController;
-import com.xcong.excoin.common.entity.FebsConstant;
-import com.xcong.excoin.common.utils.FebsUtil;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.member.service.IMemberService;
-import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
-
-import lombok.RequiredArgsConstructor;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * @author wzy
- * @date 2020-06-10
- **/
-@Controller("memberView")
-@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/member")
-@RequiredArgsConstructor
-public class ViewController extends BaseController{
-
- private final IMemberService memberService;
-
- @GetMapping("addCoin/{id}")
- @RequiresPermissions("addCoin:update")
- public String addCoin(@PathVariable long id, Model model) {
- MemberEntity data = memberService.selectMemberByid(id);
- model.addAttribute("member", data);
- return FebsUtil.view("modules/member/addCoin");
- }
-
- /**
- * 代理关系
- * @return
- */
- @GetMapping("agentInfo")
- @RequiresPermissions("agentInfo:view")
- public String agentInfo() {
- return FebsUtil.view("modules/member/agentInfo");
- }
-
- /**
- * 个人信息
- * @return
- */
- @GetMapping("memberDataInfoList")
- @RequiresPermissions("memberDataInfoList:view")
- public String memberDataInfoList() {
- return FebsUtil.view("modules/member/memberDataInfoList");
- }
-
- /**
- * 基础数据
- * @return
- */
- @GetMapping("memberDataInfo")
- @RequiresPermissions("memberDataInfo:view")
- public String memberDataInfo() {
- return FebsUtil.view("modules/member/memberDataInfo");
- }
- /**
- * 基础数据---查询
- */
- @GetMapping("memberDataInfoLists/{id}")
- @RequiresPermissions("memberDataInfoLists:view")
- public String memberDataInfoList(@PathVariable long id, Model model) {
- MemberEntity memberEntity = memberService.selectMemberByid(id);
- model.addAttribute("member", memberEntity);
- return FebsUtil.view("modules/member/memberDataInfoList");
- }
-
- @GetMapping("member")
- @RequiresPermissions("member:view")
- public String member() {
- return FebsUtil.view("modules/member/member");
- }
-
- @GetMapping("memberDetail/{id}")
- @RequiresPermissions("member:update")
- public String memberDetail(@PathVariable long id, Model model) {
- MemberAuthenticationVo data = memberService.selectMemberAuthenticationById(id);
- model.addAttribute("member", data);
- return FebsUtil.view("modules/member/memberDetail");
- }
-
- /**
- * 会员充值USDT记录
- * @return
- */
- @GetMapping("chargeUsdt")
- @RequiresPermissions("chargeUsdt:view")
- public String chargeUsdt() {
- return FebsUtil.view("modules/member/chargeUsdt");
- }
-
- /**
- * 会员USDT提现记录
- * @return
- */
- @GetMapping("extractUsdt")
- @RequiresPermissions("extractUsdt:view")
- public String extractUsdt() {
- return FebsUtil.view("modules/member/extractUsdt");
- }
-
- /**
- * 充币记录
- * @return
- */
- @GetMapping("applyCoin")
- @RequiresPermissions("applyCoins:view")
- public String applyCoin() {
- return FebsUtil.view("modules/member/applyCoin");
- }
-
- /**
- * 提币记录
- * @return
- */
- @GetMapping("withdrawCoin")
- @RequiresPermissions("withdrawCoins:view")
- public String withdrawCoin() {
- return FebsUtil.view("modules/member/withdrawCoin");
- }
-
- /**
- * 提币记录
- * @return
- */
- @GetMapping("withdrawCoinTest")
- @RequiresPermissions("withdrawCoinTest:view")
- public String withdrawCoinTest() {
- return FebsUtil.view("modules/member/withdrawCoinTest");
- }
-
- @GetMapping("memberTest")
- @RequiresPermissions("memberTest:view")
- public String memberTest() {
- return FebsUtil.view("modules/member/memberTest");
- }
-
-
-}
+package com.xcong.excoin.modules.member.controller;
+
+import com.xcong.excoin.common.controller.BaseController;
+import com.xcong.excoin.common.entity.FebsConstant;
+import com.xcong.excoin.common.utils.FebsUtil;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.service.IMemberService;
+import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
+import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;
+
+import lombok.RequiredArgsConstructor;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author wzy
+ * @date 2020-06-10
+ **/
+@Controller("memberView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/member")
+@RequiredArgsConstructor
+public class ViewController extends BaseController{
+
+ private final IMemberService memberService;
+
+ @GetMapping("addCoin/{id}")
+ @RequiresPermissions("addCoin:update")
+ public String addCoin(@PathVariable long id, Model model) {
+ MemberEntity data = memberService.selectMemberByid(id);
+ model.addAttribute("member", data);
+ return FebsUtil.view("modules/member/addCoin");
+ }
+
+ /**
+ * 代理关系
+ * @return
+ */
+ @GetMapping("agentInfo")
+ @RequiresPermissions("agentInfo:view")
+ public String agentInfo() {
+ return FebsUtil.view("modules/member/agentInfo");
+ }
+
+ /**
+ * 个人信息
+ * @return
+ */
+ @GetMapping("memberDataInfoList")
+ @RequiresPermissions("memberDataInfoList:view")
+ public String memberDataInfoList() {
+ return FebsUtil.view("modules/member/memberDataInfoList");
+ }
+
+ /**
+ * 基础数据
+ * @return
+ */
+ @GetMapping("memberDataInfo")
+ @RequiresPermissions("memberDataInfo:view")
+ public String memberDataInfo() {
+ return FebsUtil.view("modules/member/memberDataInfo");
+ }
+ /**
+ * 基础数据---查询
+ */
+ @GetMapping("memberDataInfoLists/{id}")
+ @RequiresPermissions("memberDataInfoLists:view")
+ public String memberDataInfoList(@PathVariable long id, Model model) {
+ MemberEntity memberEntity = memberService.selectMemberByid(id);
+ model.addAttribute("member", memberEntity);
+ return FebsUtil.view("modules/member/memberDataInfoList");
+ }
+
+ @GetMapping("member")
+ @RequiresPermissions("member:view")
+ public String member() {
+ return FebsUtil.view("modules/member/member");
+ }
+
+ @GetMapping("memberDetail/{id}")
+ @RequiresPermissions("member:update")
+ public String memberDetail(@PathVariable long id, Model model) {
+ MemberAuthenticationVo data = memberService.selectMemberAuthenticationById(id);
+ model.addAttribute("member", data);
+ return FebsUtil.view("modules/member/memberDetail");
+ }
+ /**
+ * 提币审核管理---个人详情
+ */
+ @GetMapping("memberInfoDetail/{id}")
+ @RequiresPermissions("memberInfoDetail:update")
+ public String memberInfoDetail(@PathVariable long id, Model model) {
+ MemberInfoDetailVo data = memberService.selectMemberInfoDetailById(id);
+ model.addAttribute("member", data);
+ return FebsUtil.view("modules/member/memberInfoDetail");
+ }
+
+ /**
+ * 会员充值USDT记录
+ * @return
+ */
+ @GetMapping("chargeUsdt")
+ @RequiresPermissions("chargeUsdt:view")
+ public String chargeUsdt() {
+ return FebsUtil.view("modules/member/chargeUsdt");
+ }
+
+ /**
+ * 会员USDT提现记录
+ * @return
+ */
+ @GetMapping("extractUsdt")
+ @RequiresPermissions("extractUsdt:view")
+ public String extractUsdt() {
+ return FebsUtil.view("modules/member/extractUsdt");
+ }
+
+ /**
+ * 充币记录
+ * @return
+ */
+ @GetMapping("applyCoin")
+ @RequiresPermissions("applyCoins:view")
+ public String applyCoin() {
+ return FebsUtil.view("modules/member/applyCoin");
+ }
+
+ /**
+ * 提币记录
+ * @return
+ */
+ @GetMapping("withdrawCoin")
+ @RequiresPermissions("withdrawCoins:view")
+ public String withdrawCoin() {
+ return FebsUtil.view("modules/member/withdrawCoin");
+ }
+
+ /**
+ * 提币记录
+ * @return
+ */
+ @GetMapping("withdrawCoinTest")
+ @RequiresPermissions("withdrawCoinTest:view")
+ public String withdrawCoinTest() {
+ return FebsUtil.view("modules/member/withdrawCoinTest");
+ }
+
+ @GetMapping("memberTest")
+ @RequiresPermissions("memberTest:view")
+ public String memberTest() {
+ return FebsUtil.view("modules/member/memberTest");
+ }
+
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
index a393aca..9f69fe7 100644
--- a/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/member/mapper/MemberMapper.java
@@ -64,5 +64,29 @@
List<String> selectMemberBylowLevelInviteId(String lowLevelInviteId);
String selectRewardratioForBasicRealDataBymid(Long memberId);
+
+ String selectTotalAmountUsdtBForBasicRealDataBymemberId(Long memberId);
+
+ String selectTotalAmountUsdtSForBasicRealDataBymemberId(Long memberId);
+
+ String selectTotalAmountUsdtCZForBasicRealDataBymemberId(Long memberId);
+
+ String selectTotalAmountUsdtTXForBasicRealDataBymemberId(Long memberId);
+
+ String selectReturnMoneyForBasicRealDataBymemberId(Long memberId);
+
+ String selectClosingpriceForBasicRealDataBymemberId(Long memberId);
+
+ String selectSellClosingpriceForBasicRealDataBymemberId(Long memberId);
+
+ String selectRewardratioForBasicRealDataBymemberId(Long memberId);
+
+ String selectprepriceForBasicRealDataBymemberId(Long memberId);
+
+ String selectBBZCForBasicRealDataBymemberId(Long memberId);
+
+ String selectHYZCForBasicRealDataBymemberId(Long memberId);
+
+ String selectDLZCForBasicRealDataBymemberId(Long memberId);
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
index fc6b27d..9088e82 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/IMemberService.java
@@ -1,68 +1,71 @@
-package com.xcong.excoin.modules.member.service;
-
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xcong.excoin.common.entity.FebsResponse;
-import com.xcong.excoin.common.entity.QueryRequest;
-import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
-import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
-import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
-import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
-import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
-import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
-import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
-import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
-import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
-import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
-
-/**
- * @author helius
- */
-public interface IMemberService extends IService<MemberEntity> {
-
- IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
-
- IPage<MemberQuickBuySaleVo> findmemberQuickBuySaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
-
- FebsResponse memberChargeUsdtConfirm(@NotNull(message = "{required}") Long id);
-
- FebsResponse memberChargeUsdtCancel(@NotNull(message = "{required}") Long id);
-
- IPage<MemberQuickSaleVo> findmemberQuickSaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
-
- FebsResponse memberExtractUsdtCancel(@NotNull(message = "{required}") Long id);
-
- FebsResponse memberExtractUsdtConfirm(@NotNull(message = "{required}") Long id);
-
- IPage<MemberCoinChargeVo> findMemberApplyCoinListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
-
- IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request);
-
- FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id);
-
- FebsResponse memberWithdrawCoinCancel(@NotNull(message = "{required}") Long id);
-
- MemberAuthenticationVo selectMemberAuthenticationById(@NotNull(message = "{required}") long id);
-
- FebsResponse memberDetailConfirm(@Valid MemberDetailConfirmDto memberDetailConfirmDto);
-
- List<MemberCoinChargeEntity> selectMemberDataInfoById(long id);
-
- IPage<MemberDataInfoVo> findMemberDataInfoDtoListInPage(MemberEntity memberEntity, QueryRequest request);
-
- MemberEntity selectMemberByid(long id);
-
- FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id);
-
- IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request);
-
- FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity);
-
-}
+package com.xcong.excoin.modules.member.service;
+
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.common.entity.FebsResponse;
+import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
+import com.xcong.excoin.modules.member.entity.MemberCoinChargeEntity;
+import com.xcong.excoin.modules.member.entity.MemberCoinWithdrawEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberQuickBuySaleEntity;
+import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
+import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
+import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
+import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
+import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;
+import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
+import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
+
+/**
+ * @author helius
+ */
+public interface IMemberService extends IService<MemberEntity> {
+
+ IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request);
+
+ IPage<MemberQuickBuySaleVo> findmemberQuickBuySaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
+
+ FebsResponse memberChargeUsdtConfirm(@NotNull(message = "{required}") Long id);
+
+ FebsResponse memberChargeUsdtCancel(@NotNull(message = "{required}") Long id);
+
+ IPage<MemberQuickSaleVo> findmemberQuickSaleListInPage(MemberQuickBuySaleEntity memberQuickBuySaleEntity, QueryRequest request);
+
+ FebsResponse memberExtractUsdtCancel(@NotNull(message = "{required}") Long id);
+
+ FebsResponse memberExtractUsdtConfirm(@NotNull(message = "{required}") Long id);
+
+ IPage<MemberCoinChargeVo> findMemberApplyCoinListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
+
+ IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request);
+
+ FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id);
+
+ FebsResponse memberWithdrawCoinCancel(@NotNull(message = "{required}") Long id);
+
+ MemberAuthenticationVo selectMemberAuthenticationById(@NotNull(message = "{required}") long id);
+
+ FebsResponse memberDetailConfirm(@Valid MemberDetailConfirmDto memberDetailConfirmDto);
+
+ List<MemberCoinChargeEntity> selectMemberDataInfoById(long id);
+
+ IPage<MemberDataInfoVo> findMemberDataInfoDtoListInPage(MemberEntity memberEntity, QueryRequest request);
+
+ MemberEntity selectMemberByid(long id);
+
+ FebsResponse memberDataInfoList(@NotNull(message = "{required}") long id);
+
+ IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity, QueryRequest request);
+
+ FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity);
+
+ MemberInfoDetailVo selectMemberInfoDetailById(long id);
+
+}
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 43fa408..bd4f165 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
@@ -31,6 +31,7 @@
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
import com.xcong.excoin.modules.member.vo.MemberDataInfoVo;
+import com.xcong.excoin.modules.member.vo.MemberInfoDetailVo;
import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;
@@ -709,4 +710,57 @@
return new FebsResponse().success();
}
+
+ @Override
+ public MemberInfoDetailVo selectMemberInfoDetailById(long id) {
+ MemberCoinWithdrawEntity selectById = memberCoinWithdrawMapper.selectById(id);
+ Long memberId = selectById.getMemberId();
+ MemberInfoDetailVo memberInfoDetailVo = new MemberInfoDetailVo();
+
+ //USDT充币总额+USDT提币总额
+ String totalAmountUsdtB = memberMapper.selectTotalAmountUsdtBForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setChargeCoin(totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+ String totalAmountUsdtS = memberMapper.selectTotalAmountUsdtSForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setAppealCoin(totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ //USDT充值总额+USDT提现总额
+ String totalAmountUsdtCZ = memberMapper.selectTotalAmountUsdtCZForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setChargeUsdt(totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+ String totalAmountUsdtTX = memberMapper.selectTotalAmountUsdtTXForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setAppealUsdt(totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+ //总剩余
+ double platformProfitAndLoss = 0 ;
+ platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtB == null ? 0 : Double.parseDouble(totalAmountUsdtB));
+ platformProfitAndLoss = platformProfitAndLoss + (totalAmountUsdtCZ == null ? 0 : Double.parseDouble(totalAmountUsdtCZ));
+ platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtS == null ? 0 : Double.parseDouble(totalAmountUsdtS));
+ platformProfitAndLoss = platformProfitAndLoss - (totalAmountUsdtTX == null ? 0 : Double.parseDouble(totalAmountUsdtTX));
+ memberInfoDetailVo.setTotalCoin(platformProfitAndLoss);
+ //佣金
+ String returnMoneyByMid = memberMapper.selectReturnMoneyForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setFee(returnMoneyByMid == null ? 0 : Double.parseDouble(returnMoneyByMid));
+ //开仓手续费总额
+ String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setClosingPrice(closingpriceByMid == null ? 0 : Double.parseDouble(closingpriceByMid));
+ //平仓总手续费
+ String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setSellClosingPrice(sellClosingpriceByMid == null ? 0 : Double.parseDouble(sellClosingpriceByMid));
+
+ //总盈亏
+ String rewardratioByMid = memberMapper.selectRewardratioForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setPlatformProfitAndLoss(rewardratioByMid == null ? 0 : Double.parseDouble(rewardratioByMid));
+
+ //持仓手续费
+ String doingPrice = memberMapper.selectprepriceForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setDoingPrice(doingPrice == null ? 0 : Double.parseDouble(doingPrice));
+
+ //账户金额
+ String walletNum = memberMapper.selectBBZCForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setWalletCoinNum(walletNum == null ? 0 : Double.parseDouble(walletNum));
+ String walletCoinNum = memberMapper.selectHYZCForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setTotalContract(walletCoinNum == null ? 0 : Double.parseDouble(walletCoinNum));
+ String agentNum = memberMapper.selectDLZCForBasicRealDataBymemberId(memberId);
+ memberInfoDetailVo.setAgentNum(agentNum == null ? 0 : Double.parseDouble(agentNum));
+
+ return memberInfoDetailVo;
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/vo/MemberInfoDetailVo.java b/src/main/java/com/xcong/excoin/modules/member/vo/MemberInfoDetailVo.java
new file mode 100644
index 0000000..a1e158e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/vo/MemberInfoDetailVo.java
@@ -0,0 +1,36 @@
+package com.xcong.excoin.modules.member.vo;
+
+import lombok.Data;
+
+@Data
+public class MemberInfoDetailVo {
+
+ private double walletCoinNum;//币币余额
+
+ private double agentNum;//代理账户余额
+
+ private double fee;//佣金
+
+ private double totalCoin;//总资产剩余
+
+ private double avalableContract;//合约可用余额
+
+ private double totalContract;//合约总余额
+
+ private double chargeUsdt;//充值USDT
+
+ private double appealUsdt;//提现USDT
+
+ private double chargeCoin;//充币
+
+ private double appealCoin;//提币
+
+ private double platformProfitAndLoss;//总盈亏
+
+ private double closingPrice;//开仓费
+
+ private double sellClosingPrice;//平仓费
+
+ private double doingPrice;//持仓费
+
+}
diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index bf0cd16..ae6ae7b 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -70,6 +70,15 @@
select COUNT(m.id) as memberCount from member m
</select>
+ <select id="selectTotalAmountUsdtBForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.amount),'0') as amount
+ FROM
+ member_coin_charge a
+ WHERE
+ a.symbol = 'USDT'
+ AND a.member_id = #{memberId}
+ </select>
<select id="selectTotalAmountUsdtBForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(a.amount),'0') as amount
@@ -86,6 +95,15 @@
account_type = '2'
AND account_status = '1'
)
+ </select>
+ <select id="selectTotalAmountUsdtSForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.amount),'0') as amount
+ FROM
+ member_coin_withdraw a
+ WHERE
+ a. STATUS = 2
+ AND a.member_id = #{memberId}
</select>
<select id="selectTotalAmountUsdtSForBasicRealData" resultType="java.lang.String">
SELECT
@@ -106,6 +124,16 @@
)
</select>
+ <select id="selectTotalAmountUsdtCZForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(amount_usdt),'0')
+ FROM
+ member_quick_buy_sale
+ WHERE
+ order_type = 'B'
+ AND order_status = 3
+ AND member_id = #{memberId}
+ </select>
<select id="selectTotalAmountUsdtCZForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(amount_usdt),'0')
@@ -123,6 +151,16 @@
account_type = '2'
AND account_status = '1'
)
+ </select>
+ <select id="selectTotalAmountUsdtTXForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(amount_usdt),'0')
+ FROM
+ member_quick_buy_sale
+ WHERE
+ order_type = 'S'
+ AND order_status = 2
+ AND member_id = #{memberId}
</select>
<select id="selectTotalAmountUsdtTXForBasicRealData" resultType="java.lang.String">
SELECT
@@ -142,6 +180,17 @@
AND account_status = '1'
)
</select>
+ <select id="selectReturnMoneyForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(s.amount), '0')
+ FROM
+ member_account_money_change s
+ WHERE
+ s.type = 3
+ AND s.content LIKE '%佣金到账%'
+ AND s.STATUS = '1'
+ AND s.member_id = #{memberId}
+ </select>
<select id="selectReturnMoneyForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(s.amount), '0')
@@ -151,6 +200,16 @@
s.type = 3
AND s.content LIKE '%佣金到账%'
AND s. STATUS = '1'
+ </select>
+ <select id="selectClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.opening_fee_amount),'0')
+ FROM
+ contract_order a
+ WHERE
+ a.closing_type = '0'
+ and a.order_status = '1'
+ AND a.member_id = #{memberId}
</select>
<select id="selectClosingpriceForBasicRealData" resultType="java.lang.String">
SELECT
@@ -170,6 +229,16 @@
AND account_status = '1'
)
</select>
+ <select id="selectSellClosingpriceForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.closing_fee_amount),'0')
+ FROM
+ contract_order a
+ WHERE
+ a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
+ and a.order_status = '1'
+ AND a.member_id = #{memberId}
+ </select>
<select id="selectSellClosingpriceForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(a.closing_fee_amount),'0')
@@ -187,6 +256,16 @@
account_type = '2'
AND account_status = '1'
)
+ </select>
+ <select id="selectRewardratioForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.reward_amount), '0')
+ FROM
+ contract_order a
+ WHERE
+ a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
+ AND a.order_status = '1'
+ AND a.member_id = #{memberId}
</select>
<select id="selectRewardratioForBasicRealData" resultType="java.lang.String">
SELECT
@@ -274,6 +353,14 @@
AND account_status = '1'
)
</select>
+ <select id="selectprepriceForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(a.hold_amount),'0')
+ FROM
+ contract_order a
+ WHERE
+ a.member_id = #{memberId}
+ </select>
<select id="selectprepriceForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(a.hold_amount),'0')
@@ -289,6 +376,15 @@
account_type = '2'
AND account_status = '1'
)
+ </select>
+ <select id="selectBBZCForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(available_balance),'0')
+ FROM
+ member_wallet_coin
+ WHERE
+ wallet_code = 'USDT'
+ AND member_id = #{memberId}
</select>
<select id="selectBBZCForBasicRealData" resultType="java.lang.String">
SELECT
@@ -307,6 +403,14 @@
AND account_status = '1'
)
</select>
+ <select id="selectHYZCForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(total_balance),'0')
+ FROM
+ member_wallet_contract
+ WHERE
+ member_id = #{memberId}
+ </select>
<select id="selectHYZCForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(total_balance),'0')
@@ -323,6 +427,14 @@
AND account_status = '1'
)
</select>
+ <select id="selectDLZCForBasicRealDataBymemberId" resultType="java.lang.String">
+ SELECT
+ IFNULL(SUM(total_balance),'0')
+ FROM
+ member_wallet_agent
+ WHERE
+ member_id = #{memberId}
+ </select>
<select id="selectDLZCForBasicRealData" resultType="java.lang.String">
SELECT
IFNULL(SUM(total_balance),'0')
diff --git a/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html b/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html
new file mode 100644
index 0000000..84cc877
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/member/memberInfoDetail.html
@@ -0,0 +1,52 @@
+<style>
+ #user-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #user-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #user-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #user-add .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+
+</style>
+<div class="layui-fluid" id="user-update">
+ <form class="layui-form" action="" lay-filter="user-update-form">
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">总资产剩余：</label>
+ <div class="layui-input-block">
+ <input type="text" name="totalCoin" minlength="4" maxlength="10" data-th-id="${member.totalCoin}"
+ lay-verify="range|totalCoin" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ form = layui.form,
+ member = [[${member}]],
+ $view = $('#user-update'),
+ validate = layui.validate,
+ _deptTree;
+
+ form.render();
+ initUserValue();
+
+ function initUserValue() {
+ form.val("user-update-form", {
+ "totalCoin": member.totalCoin
+ });
+ }
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index f275e9c..56a68df 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -96,10 +96,11 @@
cancelUsers(data.id);
});
}
- if (layEvent === 'see') {
- console.log(obj)
- febs.view.tab.change(ctx + "modules/member/memberDataInfoLists/" + data.id);
- }
+ if (layEvent === 'examine') {
+ febs.modal.open( '个人数据详情', 'modules/member/memberInfoDetail/' + data.id, {
+ maxmin: true,
+ });
+ }
});
@@ -125,7 +126,6 @@
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
- treeSelect.revokeNode('dept');
sortObject.type = 'null';
tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
});
@@ -178,10 +178,11 @@
return '<a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>'
+'<i class="layui-icon febs-edit-area febs-blue"></i>'
+'<a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>'
+ +'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'
}else {
return ''
}
- },minWidth: 200,align:'center'}
+ },minWidth: 200,align:'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'}
]]
});
}
--
Gitblit v1.9.1