feat: 最新代码及配置

hjl

2024-07-26 f8cc44e926fd22f9d1d864dc684c827f6960270b

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -131,8 +131,8 @@


    @Override
    public Page<OrderCountVO> orderCount(String name, String phone, Page<OrderCountVO> page) {
        return baseMapper.orderCount(name, phone, page);
    public Page<OrderCountVO> orderCount(String name, String phone, List<String> cityList, Page<OrderCountVO> page) {
        return baseMapper.orderCount(name, phone, cityList, page);
    }

    @Override
@@ -307,6 +307,7 @@
        order.setServeName(serveName);
        order.setServePrice(defaultPrice);
        order.setUserId(userId);
        order.setIsEvaluate(Constants.ZERO);
        order.setReservationName(reservationName);
        order.setReservationPhone(reservationPhone);
        if (null == userOrderRequest.getAddressId()) {