20211216

xiaoyong931011

2021-12-22 dab3233712eaf2239c688b50042625e4cfb9068e

20211216

 src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java

@@ -35,7 +35,7 @@
    }

    /**
     * 会员订单列表
     * 用户充值列表
     */
    @GetMapping("getOrders")
    public FebsResponse getOrders(VideoVipOrderInfoEntity videoVipOrderInfoEntity, QueryRequest request) {

 src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java

@@ -34,7 +34,7 @@


    /**
     * 会员订单列表
     * 用户充值列表
     * @return
     */
    @GetMapping("orderList")

 src/main/java/cc/mrbird/febs/video/entity/VideoVipOrderInfoEntity.java

@@ -1,6 +1,7 @@
package cc.mrbird.febs.video.entity;

import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -61,4 +62,8 @@
     * 支付时间
     */
    private Date payTime;


    @TableField(exist = false)
    private String account;
}

 src/main/java/cc/mrbird/febs/video/vo/AdminVideoVipOrderInfoVo.java

@@ -1,9 +1,58 @@
package cc.mrbird.febs.video.vo;

import com.google.type.Date;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value = "AdminVideoVipOrderInfoVo", description = "返回参数类")
public class AdminVideoVipOrderInfoVo {

    private Long id;

    private String account;

    private String name;

    /**
     * 订单编号
     */
    private String orderNo;

    /**
     * 支付交易编号
     */
    private String payTraderNo;

    /**
     * 类型;1/支付宝 2/USDT
     */
    private Integer payType;

    /**
     * 用户ID
     */
    private Long memberId;

    /**
     * 金额
     */
    private BigDecimal amount;

    /**
     * 商品类型;MONTH/PERIOD/YEAR
     */
    private String goodsType;

    /**
     * 状态;1/代支付 2/已支付 3/已取消
     */
    private Integer status;

    /**
     * 支付时间
     */
    private String payTime;
}

 src/main/resources/mapper/modules/VideoMemberMapper.xml

@@ -50,8 +50,27 @@

    <select id="selectAdminVideoVipOrderInfoVoInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo">
        SELECT
        a.*
        a.id id,
        a.order_no orderNo,
        a.pay_trader_no payTraderNo,
        a.pay_type payType,
        a.member_id memberId,
        a.amount amount,
        a.goods_type goodsType,
        a.status status,
        a.pay_time payTime,
               b.account account,
               b.name name
        FROM video_vip_order_info a
        left join video_member b on b.id = a.member_id
        <where>
            <if test="record != null" >
                <if test="record.account!=null and record.account!=''">
                    and (b.account like concat('%',  #{record.account},'%')
                    or b.name like concat('%', #{record.account}, '%'))
                </if>
            </if>
        </where>
        order by a.CREATED_TIME desc
    </select>


 src/main/resources/templates/febs/views/videoMember/orderList.html

New file
@@ -0,0 +1,141 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-user" 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="user-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" placeholder="账号/昵称" name="account" autocomplete="off" class="layui-input">
                                        </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">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="user:view,user:update,user:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
    </span>
    <a lay-event="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-user'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(orderTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
        });



        // 查询按钮
        $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();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'orderTable',
                url: ctx + 'admin/videoMember/getOrders',
                cols: [[
                    {field: 'account', title: '账号', minWidth: 150,align:'left'},
                    {field: 'name', title: '昵称', minWidth: 100,align:'left'},
                    {field: 'orderNo', title: '订单编号', minWidth: 180,align:'center'},
                    {field: 'goodsType', title: '商品类型',
                        templet: function (d) {
                            if (d.goodsType === 'MONTH') {
                                return '<span>月卡</span>'
                            } else if (d.goodsType === 'PERIOD') {
                                return '<span>季卡</span>'
                            }else if (d.goodsType === 'YEAR') {
                                return '<span>年卡</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'amount', title: '金额', minWidth: 180,align:'center'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:red;">待支付</span>'
                            } else if (d.status === 2) {
                                return '<span style="color:green;">已支付</span>'
                            }else if (d.status === 3) {
                                return '<span>已取消</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'payTraderNo', title: '支付交易编号', minWidth: 180,align:'center'},
                    {field: 'payType', title: '类型',
                        templet: function (d) {
                            if (d.payType === 2) {
                                return '<span>USDT</span>'
                            } else if (d.payType === 1) {
                                return '<span>支付宝</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 80,align:'center'},
                    {field: 'payTime', title: '支付时间', minWidth: 180,align:'center'}

                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
                account: $searchForm.find('input[name="account"]').val().trim(),
            };
        }

    })
</script>