From 0c2965362c5f7ec353ec8819557b772a4f39a82e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Nov 2022 09:56:37 +0800
Subject: [PATCH] 20221116,IGT充值未到账，比对本地地址 同步充值USDT-TRC20
---
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
index d0b488f..97483c9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -7,12 +7,13 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.dto.PriceSettingDto;
-import cc.mrbird.febs.dapp.entity.AppVersion;
-import cc.mrbird.febs.dapp.entity.DappMemberEntity;
-import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
-import cc.mrbird.febs.dapp.entity.MemberCoinChargeEntity;
+import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.mapper.DappMessageDao;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
+import cc.mrbird.febs.dapp.vo.AdminMemberIdentityVo;
+import cc.mrbird.febs.system.entity.User;
+import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
@@ -26,6 +27,7 @@
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -203,4 +205,75 @@
public FebsResponse addCoinConfirm(@Valid DappMemberEntity memberEntity) {
return dappMemberService.payUsdt(memberEntity);
}
+
+
+ /**
+ * 会员列表---会员等级下拉框
+ */
+ @GetMapping(value = "identitySetList")
+ public FebsResponse identitySetList() {
+ List<AdminMemberIdentityVo> identityVos = dappMemberService.identitySetList();
+ return new FebsResponse().success().data(identityVos);
+ }
+
+ /**
+ *会员列表---设置会员等级
+ * @return
+ */
+ @PostMapping("identitySet")
+ @ControllerEndpoint(operation = "会员列表-设置会员等级", exceptionMessage = "操作失败")
+ public FebsResponse identitySet(@Valid DappMemberEntity memberEntity) {
+ return dappMemberService.identitySet(memberEntity);
+ }
+
+ /**
+ * 资金流水--回退
+ */
+ @GetMapping(value = "/amountFlowBack/{id}")
+ public FebsResponse amountFlowBack(@PathVariable("id") Long id) {
+ return dappMemberService.amountFlowBack(id);
+ }
+
+ /**
+ * 客服消息-列表
+ */
+ @GetMapping("messageList")
+ public FebsResponse messageList(DappMessageEntity dappMessageEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(dappMemberService.getMessageListInPage(dappMessageEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 每日资产总览-充值列表
+ */
+ @GetMapping("getFlowListByDay")
+ public FebsResponse getFlowListByDay(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewController.createTimeStr = "";
+ }
+ User currentUser = FebsUtil.getCurrentUser();
+ if(ObjectUtil.isNotEmpty(currentUser.getDescription())){
+ memberCoinChargeEntity.setDescription(currentUser.getDescription());
+ }
+ memberCoinChargeEntity.setCreateTimeStr(ViewController.createTimeStr);
+ Map<String, Object> data = getDataTable(dappMemberService.getFlowListByDay(memberCoinChargeEntity,request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 每日资产总览-提现列表
+ */
+ @GetMapping("getOutFlowListByDay")
+ public FebsResponse getOutFlowListByDay(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request, Integer parentId) {
+ if (parentId == null) {
+ ViewController.createTimeStr = "";
+ }
+ User currentUser = FebsUtil.getCurrentUser();
+ if(ObjectUtil.isNotEmpty(currentUser.getDescription())){
+ memberCoinWithdrawEntity.setDescription(currentUser.getDescription());
+ }
+ memberCoinWithdrawEntity.setCreateTimeStr(ViewController.createTimeStr);
+ Map<String, Object> data = getDataTable(dappMemberService.getOutFlowListByDay(memberCoinWithdrawEntity,request));
+ return new FebsResponse().success().data(data);
+ }
}
--
Gitblit v1.9.1