后台修改

xiaoyong931011

2023-08-17 d2d5106682f967277f689fb91c5e4af4585d684e

后台修改

 src/main/java/cc/mrbird/febs/dapp/dto/MallOrderInfoDto.java

@@ -7,7 +7,7 @@
@ApiModel(value = "MallOrderInfoDto", description = "参数接收类")
public class MallOrderInfoDto {

    private String payResult;
    private String deliverType;

    /**
     * 状态;1-待支付2-已支付3-已取消
@@ -25,6 +25,8 @@

    private Integer orderType;

    private Integer deliverState;

    private String startTime;

    private String endTime;

 src/main/resources/mapper/dapp/MallGoodsMapper.xml

@@ -57,8 +57,8 @@
                <if test="record.goodsName != null and record.goodsName != ''">
                    and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
                </if>
                <if test="record.payResult != null and record.payResult != ''">
                    and a.pay_result = #{record.payResult}
                <if test="record.deliverType != null and record.deliverType != ''">
                    and a.deliver_type = #{record.deliverType}
                </if>
                <if test="record.orderType != null">
                    and a.order_type = #{record.orderType}
@@ -66,6 +66,9 @@
                <if test="record.status != null and record.status != ''">
                    and a.status = #{record.status}
                </if>
                <if test="record.deliverState != null and record.deliverState != ''">
                    and a.deliver_state = #{record.deliverState}
                </if>
                <if test="record.orderNo != null and record.orderNo != ''">
                    and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
                </if>

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

@@ -25,6 +25,16 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">提货方式：</label>
                                    <div class="layui-input-inline">
                                        <select name="deliverType">
                                            <option value="">请选择</option>
                                            <option value="1">快递寄送</option>
                                            <option value="2">到店自提</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">订单状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="status">
@@ -36,12 +46,13 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">支付状态：</label>
                                    <label class="layui-form-label">发货状态：</label>
                                    <div class="layui-input-inline">
                                        <select name="payResult">
                                        <select name="deliverState">
                                            <option value="">请选择</option>
                                            <option value="1">成功</option>
                                            <option value="2">未成功</option>
                                            <option value="1">待发货</option>
                                            <option value="2">已发货</option>
                                            <option value="3">已签收</option>
                                        </select>
                                    </div>
                                </div>
@@ -192,7 +203,17 @@
                        {field: 'address', title: '购买人', minWidth: 120,align:'left'},
                        {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
                        {field: 'status', title: '状态',
                        {field: 'deliverType', title: '提货方式',
                            templet: function (d) {
                                if (d.deliverType === 1) {
                                    return '<span style="color:blue;">快递寄送</span>'
                                } else if (d.deliverType === 2) {
                                    return '<span style="color:green;">到店自提</span>'
                                }else{
                                    return ''
                                }
                            }, minWidth: 80,align:'center'},
                        {field: 'status', title: '订单状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:blue;">待支付</span>'
@@ -207,11 +228,11 @@
                        {field: 'deliverState', title: '发货状态',
                        templet: function (d) {
                            if (d.deliverState === 1) {
                                return '<span style="color:blue;">待发货</span>'
                                return '<span style="color:red;">待发货</span>'
                            } else if (d.deliverState === 2) {
                                return '<span style="color:green;">已发货</span>'
                            }else if (d.deliverState === 3) {
                                return '<span style="color:red;">已收货</span>'
                                return '<span style="color:blue;">已签收</span>'
                            }else{
                                return ''
                            }
@@ -223,14 +244,18 @@
                        {title: '操作',
                            templet: function (d) {
                                    if (d.status === 2) {
                                        if(d.deliverState === 1){
                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="deliverGoods">发货</button>'
                                            +'<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>'
                                        if(d.deliverType === 1){
                                            if(d.deliverState === 1){
                                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="deliverGoods">发货</button>'
                                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>'
                                            }else{
                                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>'
                                            }
                                        }else{
                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>'
                                        }
                                    }else if(d.status === 3){
                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="delOrder">删除</button>'
                                        return '<button class="layui-btn layui-btn-warm layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="delOrder">删除</button>'
                                    }else{
                                        return '<button class="layui-btn layui-btn-warm layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="delOrder">删除</button>'
                                    }
@@ -253,7 +278,8 @@
                name: $searchForm.find('input[name="name"]').val().trim(),
                orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
                payResult: $searchForm.find("select[name='payResult']").val(),
                deliverState: $searchForm.find("select[name='deliverState']").val(),
                deliverType: $searchForm.find("select[name='deliverType']").val(),
                status: $searchForm.find("select[name='status']").val(),
            };
        }