From a70577eb2258f67bde70e5f995c286c9aa5fb220 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 02:27:25 +0800
Subject: [PATCH] 20221021
---
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 3 +++
src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml | 4 ++--
src/main/resources/templates/febs/views/onhookplan/planList.html | 7 +++++++
src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java | 2 ++
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 5 +++--
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
index 0001773..6acda65 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/IgtOnHookPlanOrder.java
@@ -37,4 +37,6 @@
*/
@TableField(exist = false)
private String description;
+ @TableField(exist = false)
+ private String username;
}
diff --git a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
index 17f66f6..13353fd 100644
--- a/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/dapp/DappAccountMoneyChangeDao.xml
@@ -9,8 +9,8 @@
<if test="record.description!=null and record.description!=''">
(a.member_id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids)))
</if>
- <if test="record.address !='' and record.address != null">
- and b.username like CONCAT('%',#{record.address},'%')
+ <if test="record.username !='' and record.username != null">
+ and b.username like CONCAT('%',#{record.username},'%')
</if>
<if test="record.type != null">
and a.type=#{record.type}
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index 04a1865..dd4eeed 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -67,6 +67,9 @@
left join dapp_member m on m.id = s.member_id
<where>
<if test="record != null" >
+ <if test="record.username!=null and record.username!=''">
+ m.username = #{record.username}
+ </if>
<if test="record.description!=null and record.description!=''">
(s.member_id in (select id from dapp_member where FIND_IN_SET(#{record.description}, referer_ids)))
</if>
diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index bc27446..74d9473 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -8,8 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">用户名</label>
<div class="layui-input-inline">
- <input type="text" name="address" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">
+ <input type="text" name="username" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -154,7 +155,7 @@
function getQueryParams() {
return {
type: $searchForm.find("select[name='type']").val(),
- address: $searchForm.find('input[name="address"]').val().trim()
+ username: $searchForm.find('input[name="username"]').val().trim()
};
}
diff --git a/src/main/resources/templates/febs/views/onhookplan/planList.html b/src/main/resources/templates/febs/views/onhookplan/planList.html
index d9020f0..76902f2 100644
--- a/src/main/resources/templates/febs/views/onhookplan/planList.html
+++ b/src/main/resources/templates/febs/views/onhookplan/planList.html
@@ -8,6 +8,12 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">用户名</label>
+ <div class="layui-input-inline">
+ <input type="text" name="username" autocomplete="off" 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="state">
@@ -142,6 +148,7 @@
function getQueryParams() {
return {
+ username: $searchForm.find('input[name="username"]').val().trim(),
state: $searchForm.find("select[name='state']").val()
};
}
--
Gitblit v1.9.1