8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

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

@@ -201,6 +201,7 @@
            orderByServe.setServeName(order.getServeName());
        }
        orderByServe.setPrice(order.getServePrice());
        orderByServe.setSubsidy(order.getSubsidy());
        result.setServeInfo(orderByServe);
    }

@@ -225,7 +226,11 @@
        }
        orderByUserInfo.setReservationName(order.getReservationName());
        orderByUserInfo.setReservationPhone(order.getReservationPhone());
        orderByUserInfo.setReservationAddress(order.getReservationAddress() + order.getAddress());
        if (order.getAddress()!=null) {
            orderByUserInfo.setReservationAddress(order.getReservationAddress() + order.getAddress());
        }else {
            orderByUserInfo.setReservationAddress(order.getReservationAddress());
        }
        orderByUserInfo.setTime(order.getTime());
        result.setUserInfo(orderByUserInfo);
    }