Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-06-24 0a43447534ca364ceccda80257566466e6329dd4

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-service/ruoyi-admin/src/main/resources/template/订单记录.xlsx

Binary files differ

 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/java/com/ruoyi/order/controller/WxChatPayCallBack.java

@@ -111,7 +111,7 @@
                withdrawDetail.setStatus("SUCCESS");
                withdrawDetailService.updateById(withdrawDetail);
                orderService.updateById(order);
            }else if ("CANCELLED".equals(state)){
            }else if ("CANCELLED".equals(state)||"CANCELING".equals(state)||"FAIL".equals(state)){
                // 校验提现
                List<Withdraw> list = withdrawService.lambdaQuery().eq(Withdraw::getUserId, order.getUserId())
                        .eq(Withdraw::getOrderId, order.getId()).list();
@@ -200,4 +200,13 @@
        return allTransfersSuccessful;
    }

//    public static void main(String[] args) {
//        String s = "1827928ae317443a8ef788e9ed56e8dc";
//        String s1 = HttpUtil.queryTransBatRequest(WechatConstants.WE_CHAT_PAY_QUERY_URL_PRE + s,
//                "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
//                "1665330417",
//                "D:\\apiclient_key.pem", WechatConstants.WE_CHAT_QUERY_URL_SUF + s);
//        System.err.println(s1);
//    }

}

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

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

    <select id="queryPage" 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,
        o.out_batch_no,
        o.remark,
        o.package_info,
        o.msg_count,
        o.province_code,
        o.provice_code,
        o.area_code,
        o.print_count,
        o.fake,
        o.city_code,
        o.is_reinvest,
        o.is_evaluate

        from t_order o
        <where>
            o.is_delete = 0
@@ -319,7 +367,54 @@


    <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,
        o.out_batch_no,
        o.remark,
        o.package_info,
        o.msg_count,
        o.province_code,
        o.provice_code,
        o.area_code,
        o.print_count,
        o.fake,
        o.city_code,
        o.is_reinvest,
        o.is_evaluate
        from t_order o
        <where>
            o.is_delete = 0
@@ -400,7 +495,18 @@
    </select>

    <select id="excelExportList" resultMap="BaseResultMap">
        select *
        SELECT o.id,o.reservation_name
        ,o.reservation_name
        ,o.reservation_phone
        ,o.reservation_address
        ,o.time
        ,o.complete_time
        ,o.serve_name
        ,o.site_name
        ,o.server_name
        ,o.server_phone
        ,o.remark

        from t_order o
        <where>
            o.is_delete = 0
@@ -579,7 +685,54 @@
    </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,
        o.out_batch_no,
        o.remark,
        o.package_info,
        o.msg_count,
        o.province_code,
        o.provice_code,
        o.area_code,
        o.print_count,
        o.fake,
        o.city_code,
        o.is_reinvest,
        o.is_evaluate
        from t_order o
        <where>
            o.is_delete = 0
@@ -645,7 +798,54 @@
    </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,
        o.out_batch_no,
        o.remark,
        o.package_info,
        o.msg_count,
        o.province_code,
        o.provice_code,
        o.area_code,
        o.print_count,
        o.fake,
        o.city_code,
        o.is_reinvest,
        o.is_evaluate
        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>