From ce241b10d4e31ca7f57be46e88ef4bb25ded9043 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 19:13:20 +0800
Subject: [PATCH] 20210925
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 14 ++++++++++++++
src/main/resources/templates/febs/views/modules/order/payMethodList.html | 4 ++--
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 3 +++
src/main/resources/templates/febs/views/modules/order/orderList.html | 5 +++--
src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java | 2 ++
5 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
index 7e5bd6e..3083b01 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowListDto.java
@@ -11,4 +11,6 @@
private String phone;
+ private Integer type;
+
}
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 5aa1258..58c1e6b 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -43,6 +43,9 @@
<if test="record.phone!=null and record.phone!=''">
and b.phone like concat('%', #{record.phone},'%')
</if>
+ <if test="record.type!=null and record.type!=''">
+ and a.type like concat('%', #{record.type},'%')
+ </if>
</if>
</where>
order by a.created_time desc
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 8e58caf..c998a7d 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -17,6 +17,19 @@
<input type="text" placeholder="手机号" name="phone" 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="type">
+ <option value="">请选择</option>
+ <option value="1">分红收入</option>
+ <option value="2">业绩奖励</option>
+ <option value="3">订单支付</option>
+ <option value="4">退款</option>
+ <option value="5">转账</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -109,6 +122,7 @@
return {
name: $searchForm.find('input[name="name"]').val().trim(),
phone: $searchForm.find('input[name="phone"]').val().trim(),
+ type: $searchForm.find("select[name='type']").val(),
};
}
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 16da162..09fb319 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -63,7 +63,7 @@
text-overflow: ellipsis; /*省略号显示*/
}
.layui-table img{
- max-width:200px
+ max-width:100px
}
</style>
</div>
@@ -166,12 +166,13 @@
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 120,align:'left'},
+ {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
{field: 'payOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
{field: 'payImage', title: '支付凭证',
templet: function (d) {
return '<a lay-event="seePayImage"><img id="seePayImage'+d.id+'" src="'+d.payImage+'" alt=""></a>';
- }, minWidth: 200,align:'center'},
+ }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
diff --git a/src/main/resources/templates/febs/views/modules/order/payMethodList.html b/src/main/resources/templates/febs/views/modules/order/payMethodList.html
index 850e556..cf0c9ca 100644
--- a/src/main/resources/templates/febs/views/modules/order/payMethodList.html
+++ b/src/main/resources/templates/febs/views/modules/order/payMethodList.html
@@ -26,7 +26,7 @@
white-space: normal;
}
.layui-table img{
- max-width:200px
+ max-width:100px
}
</style>
</div>
@@ -111,7 +111,7 @@
{field: 'value', title: '收款码',
templet: function (d) {
return '<a lay-event="seeImg"><img id="seeImg'+d.id+'" src="'+d.value+'" alt=""></a>';
- }, minWidth: 200,align:'center'},
+ }, minWidth: 100,align:'center'},
{title: '操作',
templet: function (d) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="payMethodedit" shiro:hasPermission="user:update">编辑</button>'
--
Gitblit v1.9.1