From a44f86a3f2d249dbd79d67f97d8a858831bf97b7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 17 Apr 2024 16:54:00 +0800
Subject: [PATCH] 代币充值
---
src/main/resources/templates/febs/views/modules/mallMember/memberChargeList.html | 7 +++++++
src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java | 2 ++
src/main/java/cc/mrbird/febs/mall/dto/ApiChargeBalanceDto.java | 4 ++++
src/main/resources/mapper/modules/MallMemberMapper.xml | 4 ++++
src/main/java/cc/mrbird/febs/mall/entity/MallMemberCharge.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1 +
6 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiChargeBalanceDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiChargeBalanceDto.java
index b98b300..787eee5 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiChargeBalanceDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiChargeBalanceDto.java
@@ -15,6 +15,10 @@
@ApiModelProperty(value = "金额", example = "1")
private BigDecimal amount;
+ @NotNull(message = "地址不能为空")
+ @ApiModelProperty(value = "地址", example = "1")
+ private String address;
+
@NotNull(message = "交易密码不能为空")
@ApiModelProperty(value = "交易密码", example = "1")
private String tradePassword;
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java
index 4acb2b3..23765b0 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MoneyChargeListDto.java
@@ -13,5 +13,7 @@
private String phone;
+ private String address;
+
private Integer status;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCharge.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCharge.java
index 6df208e..1fe994a 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCharge.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCharge.java
@@ -13,7 +13,7 @@
private Long memberId;
private BigDecimal amount;
private Integer state;//1-进行中 2-成功 3-失败
-
+ private String address;
@TableField(exist = false)
private String accountLogin;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 5c8dc0e..099ea81 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1054,6 +1054,7 @@
MallMemberCharge mallMemberCharge = new MallMemberCharge();
mallMemberCharge.setMemberId(memberId);
mallMemberCharge.setAmount(chargeAmount);
+ mallMemberCharge.setAddress(apiChargeBalanceDto.getAddress());
mallMemberCharge.setState(1);
mallMemberChargeMapper.insert(mallMemberCharge);
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 375cc89..080f28a 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -587,10 +587,14 @@
b.account_login accountLogin
from mall_member_charge a
left join mall_member b on a.member_id = b.id
+ left join mall_member_payment c on a.member_id = c.member_id
<where>
<if test="record.accountLogin!=null and record.accountLogin!=''">
and b.account_login like concat('%', #{record.accountLogin},'%')
</if>
+ <if test="record.address!=null and record.address!=''">
+ and a.address like concat('%', #{record.address},'%')
+ </if>
<if test="record.status!=null">
and a.state = #{record.status}
</if>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/memberChargeList.html b/src/main/resources/templates/febs/views/modules/mallMember/memberChargeList.html
index 282bc75..74fbbb8 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/memberChargeList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/memberChargeList.html
@@ -13,6 +13,11 @@
</div>
</div>
<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">
@@ -178,6 +183,7 @@
cols: [[
{type: 'checkbox', fixed: 'left'},
{field: 'accountLogin', title: '账户', minWidth: 180},
+ {field: 'address', title: '地址', minWidth: 180},
{field: 'amount', title: '金额(USDT)', minWidth: 130},
{title: '提现状态', templet: '#withdraw-status'},
{field: 'createdTime', title: '创建时间', minWidth: 180},
@@ -188,6 +194,7 @@
function getQueryParams() {
return {
accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
+ address: $searchForm.find('input[name="address"]').val().trim(),
status: $searchForm.find("select[name='status']").val(),
invalidate_ie_cache: new Date()
};
--
Gitblit v1.9.1