8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java

@@ -75,7 +75,12 @@
            orderListVO.setUserId(userid);
            orderListVO.setReservationName(order.getReservationName());
            orderListVO.setReservationPhone(order.getReservationPhone());
            orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
            if (order.getAddress()!=null) {
                orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
            }else {
                orderListVO.setReservationAddress(order.getReservationAddress());

            }
            orderListVO.setTime(order.getTime());
            orderListVO.setServerId(order.getServerId());
            orderListVO.setServerName(order.getServerName());
@@ -152,7 +157,12 @@
            orderListVO.setUserId(userid);
            orderListVO.setReservationName(order.getReservationName());
            orderListVO.setReservationPhone(order.getReservationPhone());
            orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
            if (order.getAddress()!=null) {
                orderListVO.setReservationAddress(order.getReservationAddress() + order.getAddress());
            }else {
                orderListVO.setReservationAddress(order.getReservationAddress());

            }
            orderListVO.setTime(order.getTime());
            orderListVO.setServerId(order.getServerId());
            orderListVO.setServerName(order.getServerName());