From 3f41b6d94730150687433dcb2fa2cd15a0299ca4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Oct 2022 14:53:38 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/entity/MemberCoinChargeEntity.java | 7 +
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 7 -
src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java | 10 ++
src/main/resources/mapper/dapp/DappMemberDao.xml | 7 +
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java | 3
src/main/resources/templates/febs/views/dapp/member-charge.html | 136 ++++++++++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 7 +
src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java | 10 ++
8 files changed, 183 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 2752505..d2f20a4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/MemberController.java
@@ -10,6 +10,7 @@
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.service.DappMemberService;
import cc.mrbird.febs.dapp.service.DappSystemService;
import lombok.RequiredArgsConstructor;
@@ -183,4 +184,13 @@
public FebsResponse updateAppVersion(@Valid AppVersion appVersion) {
return dappMemberService.updateAppVersion(appVersion);
}
+
+ /**
+ * 充值-列表
+ */
+ @GetMapping("getChargeList")
+ public FebsResponse getChargeList(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(dappMemberService.getChargeListInPage(memberCoinChargeEntity, request));
+ return new FebsResponse().success().data(data);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
index 532bacd..22e2350 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java
@@ -176,4 +176,14 @@
return FebsUtil.view("dapp/appVerSionUpdate");
}
+ /**
+ * 充值-列表
+ * @return
+ */
+ @GetMapping("chargeList")
+ @RequiresPermissions("chargeList:view")
+ public String chargeList() {
+ return FebsUtil.view("dapp/member-charge");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/MemberCoinChargeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/MemberCoinChargeEntity.java
index 7d99bfd..ca457bf 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/MemberCoinChargeEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/MemberCoinChargeEntity.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -33,4 +34,10 @@
private String hash;
private String orderCode;
+
+ /**
+ * 充值用户名
+ */
+ @TableField(exist = false)
+ private String username;
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
index 80250df..a8ee956 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.dapp.dto.TeamListDto;
import cc.mrbird.febs.dapp.entity.AppVersion;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
+import cc.mrbird.febs.dapp.entity.MemberCoinChargeEntity;
import cc.mrbird.febs.dapp.vo.ApiMyTeammateInfoListVo;
import cc.mrbird.febs.dapp.vo.TeamListVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -68,4 +69,6 @@
List<DappMemberEntity> selectTotalAmountByRefererIdAndIdentity(@Param("inviteId")String inviteId, @Param("identity")String identity);
IPage<AppVersion> getAppVersionListInPage(Page<AppVersion> page, AppVersion appVersion);
+
+ IPage<MemberCoinChargeEntity> getChargeListInPage(Page<MemberCoinChargeEntity> page, MemberCoinChargeEntity memberCoinChargeEntity);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index a724678..ff3ff85 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -3,10 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.dapp.dto.*;
-import cc.mrbird.febs.dapp.entity.AppVersion;
-import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
-import cc.mrbird.febs.dapp.entity.DappMemberEntity;
-import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity;
+import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -97,4 +94,6 @@
FebsResponse addAppVersion(AppVersion appVersion);
FebsResponse updateAppVersion(AppVersion appVersion);
+
+ IPage<MemberCoinChargeEntity> getChargeListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request);
}
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 56da281..553393a 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
@@ -974,6 +974,13 @@
return new FebsResponse().success();
}
+ @Override
+ public IPage<MemberCoinChargeEntity> getChargeListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.getChargeListInPage(page, memberCoinChargeEntity);
+ return memberCoinChargeEntityIPage;
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index c59db3d..5eeeb2f 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -238,4 +238,11 @@
<select id="getAppVersionListInPage" resultType="cc.mrbird.febs.dapp.entity.AppVersion">
select a.* from app_version a
</select>
+
+ <select id="getChargeListInPage" resultType="cc.mrbird.febs.dapp.entity.MemberCoinChargeEntity">
+ select
+ a.*,b.username username
+ from member_coin_charge a
+ inner join dapp_member b on b.id = a.member_id
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/member-charge.html b/src/main/resources/templates/febs/views/dapp/member-charge.html
new file mode 100644
index 0000000..29b4c2c
--- /dev/null
+++ b/src/main/resources/templates/febs/views/dapp/member-charge.html
@@ -0,0 +1,136 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-charge" lay-title="充值记录">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="withdraw-table-form">
+ <div class="layui-row">
+ <div class="layui-col-md10">
+ <div class="layui-form-item">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input type="text" name="address" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">提现状态</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="status">-->
+<!-- <option value=""></option>-->
+<!-- <option value="1">提现中</option>-->
+<!-- <option value="2">提现通过</option>-->
+<!-- <option value="3">提现驳回</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+ </div>
+ </div>
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="chargeTable" lay-data="{id: 'chargeTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<style>
+ .layui-table-cell {
+ height: auto !important;
+ }
+</style>
+<script data-th-inline="none" type="text/javascript">
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ var $ = layui.jquery,
+ laydate = layui.laydate,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ dropdown = layui.dropdown,
+ $view = $('#febs-charge'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'createTime', type: null},
+ tableIns;
+
+ form.render();
+
+ initTable();
+
+ // table.on('tool(chargeTable)', function (obj) {
+ // var data = obj.data,
+ // layEvent = obj.event;
+ // if (layEvent === 'agree') {
+ // febs.modal.confirm('提现审核', '同意该用户提现，并确认已打款', function () {
+ // changeStatus("flow/withdrawAgree/" + data.id);
+ // });
+ // }
+ //
+ // if (layEvent === 'disagree') {
+ // febs.modal.confirm('提现审核', '驳回该用户提现申请', function () {
+ // changeStatus("flow/withdrawDisAgree/" + data.id);
+ // });
+ // }
+ // });
+ //
+ // table.on('sort(chargeTable)', function (obj) {
+ // sortObject = obj;
+ // tableIns.reload({
+ // initSort: obj,
+ // where: $.extend(getQueryParams(), {
+ // field: obj.field,
+ // order: obj.type
+ // })
+ // });
+ // });
+
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'chargeTable',
+ url: ctx + 'member/getChargeList',
+ cols: [[
+ {field: 'username', title: '用户名', minWidth: 130},
+ {field: 'amount', title: '充值金额(USDT)', minWidth: 130},
+ {field: 'symbol', title: '币种', minWidth: 130},
+ {field: 'address', title: '地址', minWidth: 130},
+ {field: 'createTime', title: '创建时间', minWidth: 180},
+ {field: 'hash', title: '交易hash', minWidth: 130}
+ ]]
+ });
+ }
+
+ function getQueryParams() {
+ return {
+ // address: $searchForm.find('input[name="address"]').val().trim(),
+ // status: $searchForm.find("select[name='status']").val(),
+ // invalidate_ie_cache: new Date()
+ };
+ }
+
+ function changeStatus(url) {
+ febs.post(ctx + url, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ }
+ })
+</script>
--
Gitblit v1.9.1