Prechádzať zdrojové kódy

优化充值记录展示

Memory_LG 1 mesiac pred
rodič
commit
d23a51ab1b

+ 83 - 66
qmjszx-admin/src/main/resources/templates/system/vipCardLog/vipCardLog.html

@@ -1,74 +1,90 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('充值记录列表')" />
+    <th:block th:include="include :: header('充值记录列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>用户名:</label>
+                            <input type="text" name="username"/>
+                        </li>
+                        <li>
+                            <label>联系电话:</label>
+                            <input type="text" name="mobile"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:vipCardLog:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:vipCardLog:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:vipCardLog:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:vipCardLog:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:vipCardLog:add">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+               shiro:hasPermission="system:vipCardLog:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+               shiro:hasPermission="system:vipCardLog:remove">
+                <i class="fa fa-remove"></i> 删除
+            </a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:vipCardLog:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:vipCardLog:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:vipCardLog:remove')}]];
-        var paymentStatusDatas = [[${@dict.getType('payment_status')}]];
-        var prefix = ctx + "system/vipCardLog";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:vipCardLog:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:vipCardLog:remove')}]];
+    var paymentStatusDatas = [[${@dict.getType('payment_status')}]];
+    var prefix = ctx + "system/vipCardLog";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "充值记录",
-                columns: [{
-                    checkbox: true
-                },
-                {
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            // createUrl: prefix + "/add",
+            // updateUrl: prefix + "/edit/{id}",
+            // removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "充值记录",
+            columns: [{
+                checkbox: true
+            },
+                /*{
                     field: 'id',
                     title: '序号',
                     visible: false
-                },
+                },*/
                 {
-                    field: 'userId',
-                    title: '用户id'
+                    field: 'username',
+                    title: '用户姓名'
                 },
                 {
+                    field: 'mobile',
+                    title: '联系电话'
+                },
+                /*{
                     field: 'orderType',
                     title: '记录类型(充值, 退卡)'
-                },
+                },*/
                 {
                     field: 'paymentTime',
                     title: '支付时间'
@@ -79,36 +95,37 @@
                 },
                 {
                     field: 'paymentStatus',
-                    title: '支付状态(字段值: payment_status)',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(paymentStatusDatas, value);
+                    title: '支付状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(paymentStatusDatas, value);
                     }
                 },
                 {
                     field: 'orderId',
                     title: '订单编号'
                 },
-                {
+                /*{
                     field: 'refundTime',
                     title: '退款时间'
-                },
+                },*/
                 {
                     field: 'ticketId',
                     title: '支付金额'
-                },
+                }]
+                /*,
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
-                }]
-            };
-            $.table.init(options);
-        });
-    </script>
+                }]*/
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>

+ 3 - 0
qmjszx-business/src/main/java/beilv/vipCardLog/domain/VipCardLog.java

@@ -82,4 +82,7 @@ public class VipCardLog extends BaseEntity {
     @Excel(name = "支付金额")
     private BigDecimal practicalMoney;
 
+    private String username;
+    private String mobile;
+
 }

+ 15 - 10
qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml

@@ -14,24 +14,29 @@
         <result property="orderId" column="order_id"/>
         <result property="refundTime" column="refund_time"/>
         <result property="practicalMoney" column="practical_money"/>
+        <result property="username" column="username"/>
+        <result property="mobile" column="mobile"/>
     </resultMap>
 
     <sql id="selectVipCardLogVo">
-        select id,
-               user_id,
-               order_type,
-               payment_time,
-               cancellation_time,
-               payment_status,
-               order_id,
-               refund_time,
-               practical_money
-        from beilv_vip_card_log
+        select a.id,
+               a.user_id,
+               a.order_type,
+               a.payment_time,
+               a.cancellation_time,
+               a.payment_status,
+               a.order_id,
+               a.refund_time,
+               a.practical_money
+        from beilv_vip_card_log a
     </sql>
 
     <select id="selectVipCardLogList" parameterType="VipCardLog" resultMap="VipCardLogResult">
         <include refid="selectVipCardLogVo"/>
+        left join sys_member b on a.user_id = b.id
         <where>
+            <if test="username != null and username != ''">and b.username like concat('%',#{username},'%')</if>
+            <if test="mobile != null  and mobile != ''">and b.mobile like concat('%',#{mobile},'%')</if>
         </where>
     </select>