无关风月
2 天以前 30f0f81a55eef5851a62cf5a9ed7547a5a558389
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())
@@ -321,7 +321,7 @@
        withdrawDetailVO.setServeId(order.getServeId());
        withdrawDetailVO.setServeName(order.getServeName());
        withdrawDetailVO.setServePrice(order.getServePrice());
        withdrawDetailVO.setOrderMoney(order.getSubsidy()!=null?order.getSubsidy().add(order.getOrderMoney()):order.getOrderMoney());
        withdrawDetailVO.setOrderMoney(order.getOrderMoney());
        withdrawDetailVO.setReservationName(order.getReservationName());
        withdrawDetailVO.setReservationPhone(order.getReservationPhone());
        withdrawDetailVO.setReservationAddress(order.getReservationAddress());