星级补贴逻辑修改

xiaoyong931011

2023-05-06 076f5a4f0a7c5a4d3a6d3a1a61ff96a0091e3320

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -7,6 +7,12 @@
                        <div class="layui-form-item">
                            <div class="layui-col-md10">
                                <div class="layui-inline">
                                    <label class="layui-form-label">登录账户：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" placeholder="登录账户" name="accountLogin" autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">购买人：</label>
                                    <div class="layui-input-inline">
                                        <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
@@ -121,6 +127,7 @@
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" id="importDeliver" lay-event="importDeliver">导入发货</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverDone">导出已发货订单</button>
        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view">自定义打印</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverAll">导出全部订单</button>
    </div>
</script>
<!-- 表格操作栏 end -->
@@ -165,6 +172,10 @@

            if (event == 'exportDeliver') {
                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
            }

            if (event == 'exportDeliverAll') {
                window.location.href = ctx + "admin/order/exportOrderListAll?orderType=1&status=0";
            }

            if (event == 'exportDeliverDone') {
@@ -287,9 +298,10 @@
                cols: [[
                        {type: 'checkbox',fixed: 'left'},
                        {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计：'},
                        {field: 'accountLogin', title: '登录账户', minWidth: 120,align:'left'},
                        {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                        {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'memberPhone', title: '手机号码', minWidth: 120,align:'left'},
                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
                        {field: 'remark', title: '备注', minWidth: 200,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
@@ -366,6 +378,7 @@
            return {
                startTime: $searchForm.find('input[name="startTime"]').val().trim(),
                endTime: $searchForm.find('input[name="endTime"]').val().trim(),
                accountLogin: $searchForm.find('input[name="accountLogin"]').val().trim(),
                name: $searchForm.find('input[name="name"]').val().trim(),
                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),