refactor(mall): 优化订单收货类型判断逻辑

Administrator

2025-05-27 c6ac1561db0b2f1c8e3a799d7f49808f4bae67c7

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

@@ -19,7 +19,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">状态</label>
                                    <label class="layui-form-label">订单状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="status">
                                            <option value="">请选择</option>
@@ -28,19 +28,19 @@
                                            <option value="3">待收货</option>
                                            <option value="4">已完成</option>
<!--                                            <option value="5">退款中</option>-->
<!--                                            <option value="6">已退款</option>-->
                                            <option value="6">已退款</option>
                                            <option value="7">已取消</option>
                                        </select>
                                    </div>
                                </div>
<!--                                <div class="layui-inline">-->
<!--                                    <label class="layui-form-label">团长：</label>-->
<!--                                    <div class="layui-input-inline">-->
<!--                                        <select name="uniqueCode" class="order-takeUniqueCode">-->
<!--                                            <option value="">请选择</option>-->
<!--                                        </select>-->
<!--                                    </div>-->
<!--                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">自提点：</label>
                                    <div class="layui-input-inline">
                                        <select name="uniqueCode" class="order-takeUniqueCode">
                                            <option value="">请选择</option>
                                        </select>
                                    </div>
                                </div>
<!--                                <div class="layui-inline">-->
<!--                                    <label class="layui-form-label layui-form-label-sm">配送方式</label>-->
<!--                                    <div class="layui-input-inline">-->
@@ -52,7 +52,7 @@
<!--                                    </div>-->
<!--                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label layui-form-label-sm">支付状态</label>
                                    <label class="layui-form-label">支付状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="payResult">
                                            <option value="">请选择</option>
@@ -62,14 +62,14 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">开始时间</label>
                                        <label class="layui-form-label">开始时间：</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
                                                   placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
                                        </div>
                                </div>
                                <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">结束时间</label>
                                        <label class="layui-form-label">结束时间：</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
                                                   placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
@@ -120,12 +120,14 @@
</script>
<script type="text/html" id="tableToolBarOrder">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单(自提)</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmLeaderOrder">自提确认到货</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="refundOrder">仅退款</button>
<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="refundOrderAndAmount">退款退货</button>-->
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</button>
<!--        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出未发货订单（快递）</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出待发货订单（快递）</button>
        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
    </div>
</script>
@@ -168,7 +170,7 @@
        $.get(ctx + 'admin/leader/selectList', function (data) {
            for (var k in data)
            {
                $(".order-takeUniqueCode").append("<option value='" + data[k].uniqueCode + "'>" + data[k].name + "</option>");
                $(".order-takeUniqueCode").append("<option value='" + data[k].uniqueCode + "'>" + data[k].name+ "</option>");
            }
            layui.use('form', function () {
                var form = layui.form;
@@ -219,6 +221,34 @@
                // });
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if(event === 'confirmLeaderOrder'){
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                if(uniqueCodeValue == '' || uniqueCodeValue == null){
                    febs.alert.warn('请选择自提点');
                    return;
                }
                var data = checkStatus.data;
                let ids = "";
                for(let i = 0;i < data.length;i++){
                    if(data[i].status != 2){
                        febs.alert.warn('请选择待发货的订单');
                        return;
                    }else{
                        ids = ids + data[i].id+",";
                    }
                }
                // layer.alert(layui.util.escape(JSON.stringify(data)));
                console.log(ids);
                if(ids == null || ids == ""){
                    febs.alert.warn('请选择待发货的订单');
                    return;
                }
                febs.get(ctx + 'admin/order/confirmLeaderOrder?orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if(event === 'confirmOrder'){
                // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // if(uniqueCodeValue == '' || uniqueCodeValue == null){
@@ -250,12 +280,60 @@
                });
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if(event === 'refundOrder'){
                let data = checkStatus.data;
                if (data.length > 1) {
                    febs.alert.warn('每次只能操作一个订单');
                    return;
                }
                let ids = "";
                for(let i = 0;i < data.length;i++){
                    if(data[i].status != 3){
                        febs.alert.warn('请选择待收货的订单');
                        return;
                    }else{
                        ids = data[i].id;
                    }
                }
                if(ids == null || ids == ""){
                    febs.alert.warn('请选择订单');
                    return;
                }
                febs.get(ctx + 'admin/order/refundOrder?orderId='+ids+'&type=1', null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
            }
            if(event === 'refundOrderAndAmount'){
                let data = checkStatus.data;
                if (data.length > 1) {
                    febs.alert.warn('每次只能操作一个订单');
                    return;
                }
                let ids = "";
                for(let i = 0;i < data.length;i++){
                    if(data[i].status != 3){
                        febs.alert.warn('请选择待收货的订单');
                        return;
                    }else{
                        ids = data[i].id;
                    }
                }
                if(ids == null || ids == ""){
                    febs.alert.warn('请选择订单');
                    return;
                }
                febs.get(ctx + 'admin/order/refundOrder?orderId='+ids+'&type=2', null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });
            }
            if (event == 'exportDeliverOne') {
                // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // if(uniqueCodeValue == '' || uniqueCodeValue == null){
                //     febs.alert.warn('请选择团长');
                //     return;
                // }
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                if(uniqueCodeValue == '' || uniqueCodeValue == null){
                    febs.alert.warn('请选择自提点');
                    return;
                }
                var data = checkStatus.data;
                let ids = "";
                for(let i = 0;i < data.length;i++){
@@ -276,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') {
@@ -408,12 +486,35 @@
                toolbar: '#tableToolBarOrder',
                cols: [[
                        {type: 'checkbox', fixed: 'left'},
                        {type: 'numbers', title: '', width: 80},
                        {title: '操作',
                            templet: function (d) {
                                if(d.status === 2){
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
                                }else if(d.status === 3){
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateDeliver" shiro:hasPermission="user:update">修改物流信息</button>'
                                }else{
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                }

                            },minWidth: 200,align:'center'},
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
                        {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'refererName', title: '推荐人', minWidth: 100,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: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                        {field: 'remark', 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},
@@ -452,20 +553,8 @@
                    //     }, minWidth: 80,align:'center'},
                        {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
                        {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                        {field: 'remark', title: '备注', minWidth: 160,align:'left'},
                        // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
                        {title: '操作',
                            templet: function (d) {
                                if(d.status === 2){
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
                                }else if(d.status === 3){
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateDeliver" shiro:hasPermission="user:update">修改物流信息</button>'
                                }else{
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                }

                            },minWidth: 200,align:'center', fixed:'right'}
                ]]
            });
        }