From 2855ae89d2ab6268e1edc42c3e9d7e73c8e7259e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 03 九月 2024 10:09:24 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
index a2912c0..11b6fe3 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -167,6 +167,9 @@
}
if (null != serveRecord) {
orderByServeRecord.setPhoto(Arrays.stream(serveRecord.getPhoto().split(",")).collect(Collectors.toList()));
+ orderByServeRecord.setCardPic(serveRecord.getCardPic());
+ orderByServeRecord.setPaperPic(serveRecord.getPaperPic());
+ orderByServeRecord.setMachinePic(serveRecord.getMachinePic());
}
result.setServeRecordInfo(orderByServeRecord);
}
@@ -201,6 +204,7 @@
orderByServe.setServeName(order.getServeName());
}
orderByServe.setPrice(order.getServePrice());
+ orderByServe.setSubsidy(order.getSubsidy());
result.setServeInfo(orderByServe);
}
@@ -211,6 +215,7 @@
orderInfo.setOrderNumber(order.getOrderNumber());
orderInfo.setPlaceOrderTime(order.getCreateTime());
orderInfo.setState(order.getState());
+ orderInfo.setReservationRemark(order.getReservationRemark());
}
result.setOrderInfo(orderInfo);
}
@@ -225,7 +230,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);
}
--
Gitblit v1.7.1