refactor(mall): 优化活动关注记录查询逻辑

Administrator

2025-06-17 eacba04de1bf9a31e1503e7c07938f1812fe86c5

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

@@ -243,7 +243,7 @@
                    febs.alert.warn('请选择待发货的订单');
                    return;
                }
                febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
                febs.get(ctx + 'admin/order/confirmLeaderOrder?orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
@@ -354,11 +354,11 @@
                    return;
                }
                window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&orderIds="+ids;
                febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();

                });
                // febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
                //     febs.alert.success('操作成功');
                //     $query.click();
                //
                // });
            }

            if (event == 'exportDeliverTwo') {
@@ -504,11 +504,16 @@
                        {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
                        {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
                        {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                        {field: 'deliveryType', title: '提货方式',
                            templet: function (d) {
                                if (d.deliveryType === 1) {
                                    return '<span style="color:blue;">自提</span>'
                                } else if (d.deliveryType === 2) {
                                    return '<span style="color:green;">快递</span>'
                                }else{
                                    return ''
                                }
                            }, minWidth: 100,align:'center'},
                        {field: 'status', title: '状态',
                            templet: function (d) {
                                if (d.status === 1) {
@@ -529,6 +534,12 @@
                                    return ''
                                }
                            }, minWidth: 80,align:'center'},
                        {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
                        {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
                        {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},

                    // {field: 'deliveryState', title: '配送状态',
                    //     templet: function (d) {
                    //         if (d.deliveryState === 1) {