20221221

xiaoyong931011

2022-12-22 c16f945a56dbedbfd5778a6de7b124298588607c

20221221

 src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java

@@ -21,6 +21,9 @@
    @ApiModelProperty(value = "搜索参数", example = "1")
    private String query;

    @ApiModelProperty(value = "订单全状态", example = "全部不用传 2-进行中 3-已完成")
    private Integer allStatus;

    @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-已完成 5-已取消")
    private Integer status;


 src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java

@@ -30,4 +30,5 @@

    private String bindPhone;
    private String remark;
    private String bankNo;
}

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

@@ -77,9 +77,11 @@
        a.status status,
        b.name,
        b.bind_phone bindPhone,
        c.bank_no bankNo,
        b.phone
        from mall_member_withdraw a
        inner join mall_member b on a.member_id=b.id
        inner join mall_member_bank c on c.member_id=b.id
        <where>
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">

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

@@ -164,6 +164,12 @@
            <if test="record.orderType != null">
                and a.order_type=#{record.orderType}
            </if>
            <if test="record.allStatus == 2">
                and a.status <![CDATA[<= ]]> 4
            </if>
            <if test="record.allStatus == 3">
                and a.status <![CDATA[>= ]]> 4
            </if>
        </where>
        order by a.created_time desc
    </select>

 src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html

@@ -122,16 +122,15 @@
                    {field: 'withdrawNo', title: '编号', minWidth: 100,align:'left'},
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                    {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'amount', title: '金额', minWidth: 150,align:'left'},
                    {field: 'amountFee', title: '手续费', minWidth: 150,align:'left'},
                    {field: 'remark', title: '错误信息', minWidth: 150,align:'left'},
                    {field: 'bankNo', title: '地址', minWidth: 300,align:'left'},
                    {field: 'status', title: '状态',
                        templet: function (d) {
                            if (d.status === 1) {
                                return '<span style="color:green;">提现中</span>'
                                return '<span style="color:blue;">提现中</span>'
                            } else if (d.status === 2) {
                                return '<span style="color:red;">成功</span>'
                                return '<span style="color:green;">成功</span>'
                            } else if (d.status === 3) {
                                return '<span style="color:red;">拒绝</span>'
                            } else{
@@ -144,11 +143,10 @@
                            if (d.status === 1) {
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
                            }else{
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
                                return ''
                            }
                        },minWidth: 300,align:'center'}
                        },minWidth: 200,align:'center'}
                ]]
            });
        }