bug修改

无关风月

2025-06-09 3b056b270aa63cd94dca5b0b76dfc904ccb75978

bug修改

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/WithdrawController.java

@@ -138,9 +138,9 @@
                throw new GlobalException("订单信息异常！");
            }
            Boolean b = withdrawService.confirmWithdraw(openId, userId, order);
//            if (!b) {
//                throw new GlobalException("提现失败！");
//            }
            if (!b) {
                throw new GlobalException("提现失败！");
            }
        }else {
            Order order = orderService.lambdaQuery()
                    .eq(Order::getId, withdraw.getOrderId())

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -231,7 +231,42 @@
    </select>

    <select id="queryPage" resultMap="BaseResultMap">
        select o.*
        select
        o.id,
        o.city,
        o.order_number,
        o.site_id,
        o.site_name,
        o.serve_id,
        o.serve_name,
        o.serve_price,
        o.user_id,
        o.reservation_name,
        o.reservation_phone,
        o.reservation_address,
        o.time,
        o.server_id,
        o.server_name,
        o.server_phone,
        o.reservation_remark,
        o.order_money,
        o.state,
        o.createBy,
        o.updateBy,
        o.createTime,
        o.updateTime,
        o.is_delete,
        o.accept_time,
        o.type,
        o.longitude,
        o.latitude,
        o.arrive_time,
        o.complete_time,
        o.is_withdrawal,
        o.subsidy,
        o.address,
        o.top_sort,
        o.cancel_reason
        from t_order o
        <where>
            o.is_delete = 0
@@ -319,7 +354,42 @@


    <select id="queryPage1" resultMap="BaseResultMap">
        select *
        select
        o.id,
        o.city,
        o.order_number,
        o.site_id,
        o.site_name,
        o.serve_id,
        o.serve_name,
        o.serve_price,
        o.user_id,
        o.reservation_name,
        o.reservation_phone,
        o.reservation_address,
        o.time,
        o.server_id,
        o.server_name,
        o.server_phone,
        o.reservation_remark,
        o.order_money,
        o.state,
        o.createBy,
        o.updateBy,
        o.createTime,
        o.updateTime,
        o.is_delete,
        o.accept_time,
        o.type,
        o.longitude,
        o.latitude,
        o.arrive_time,
        o.complete_time,
        o.is_withdrawal,
        o.subsidy,
        o.address,
        o.top_sort,
        o.cancel_reason
        from t_order o
        <where>
            o.is_delete = 0
@@ -590,7 +660,42 @@
    </select>

    <select id="exportList" resultMap="BaseResultMap">
        select *
        select
        o.id,
        o.city,
        o.order_number,
        o.site_id,
        o.site_name,
        o.serve_id,
        o.serve_name,
        o.serve_price,
        o.user_id,
        o.reservation_name,
        o.reservation_phone,
        o.reservation_address,
        o.time,
        o.server_id,
        o.server_name,
        o.server_phone,
        o.reservation_remark,
        o.order_money,
        o.state,
        o.createBy,
        o.updateBy,
        o.createTime,
        o.updateTime,
        o.is_delete,
        o.accept_time,
        o.type,
        o.longitude,
        o.latitude,
        o.arrive_time,
        o.complete_time,
        o.is_withdrawal,
        o.subsidy,
        o.address,
        o.top_sort,
        o.cancel_reason
        from t_order o
        <where>
            o.is_delete = 0
@@ -656,7 +761,42 @@
    </select>

    <select id="orderListWorker" resultMap="BaseResultMap">
        select o.*
        select
        o.id,
        o.city,
        o.order_number,
        o.site_id,
        o.site_name,
        o.serve_id,
        o.serve_name,
        o.serve_price,
        o.user_id,
        o.reservation_name,
        o.reservation_phone,
        o.reservation_address,
        o.time,
        o.server_id,
        o.server_name,
        o.server_phone,
        o.reservation_remark,
        o.order_money,
        o.state,
        o.createBy,
        o.updateBy,
        o.createTime,
        o.updateTime,
        o.is_delete,
        o.accept_time,
        o.type,
        o.longitude,
        o.latitude,
        o.arrive_time,
        o.complete_time,
        o.is_withdrawal,
        o.subsidy,
        o.address,
        o.top_sort,
        o.cancel_reason
        from t_order o
        <where>
            o.is_delete = 0

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/WithdrawMapper.xml

@@ -44,7 +44,22 @@
    </select>

    <select id="withdrawPage1" resultMap="voMap">
        SELECT *
        SELECT
        w.id,
        w.user_id,
        w.user_no,
        w.nick_name,
        w.user_phone,
        w.apply_for_time,
        w.apply_for_money,
        w.state,
        w.opinion,
        w.createBy,
        w.updateBy,
        w.createTime,
        w.updateTime,
        w.is_delete,
        w.order_id
        FROM t_withdraw w
        left join t_order o on w.order_id = o.id
        <where>
@@ -218,7 +233,22 @@


    <select id="withdrawList1" resultMap="voMap">
        SELECT *
        SELECT
        w.id,
        w.user_id,
        w.user_no,
        w.nick_name,
        w.user_phone,
        w.apply_for_time,
        w.apply_for_money,
        w.state,
        w.opinion,
        w.createBy,
        w.updateBy,
        w.createTime,
        w.updateTime,
        w.is_delete,
        w.order_id
        FROM t_withdraw w
        left join t_order o on w.order_id = o.id
        <where>