From 67157345fe1878681e39ec186ef37ff6b3b5c1fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 03 八月 2024 18:07:00 +0800
Subject: [PATCH] 8.3
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index eb87068..3e416ab 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -277,7 +277,7 @@
order.setUserId(userId);
order.setReservationName(reservationName);
order.setReservationPhone(reservationPhone);
- order.setReservationAddress(address);
+ order.setReservationAddress(address+cityCode.getData().getName());
order.setTime(time);
order.setReservationRemark(reservationRemark);
order.setOrderMoney(defaultPrice.add(new BigDecimal(String.valueOf(subsidy))));
@@ -295,9 +295,15 @@
return this.save(order);
}
+
@Override
public String orderEstimate(UserOrderRequest userOrderRequest) {
R<AddressDto> cityCode = userClient.getCityCode(userOrderRequest.getAddressId());
+ R<BigDecimal> servePrice = userClient.getServePrice(userOrderRequest.getServeId(), cityCode.getData().getCityCode());
+ if (servePrice.getData()!=null){
+ userOrderRequest.setDefaultPrice(servePrice.getData());
+ }
+
// 下单参数
String orderNumber = userOrderRequest.getOrderNumber();
@@ -325,9 +331,9 @@
order.setReservationName(reservationName);
order.setReservationPhone(reservationPhone);
if (null == userOrderRequest.getAddressId()) {
- order.setReservationAddress(addressDetail);
+ order.setReservationAddress(addressDetail+cityCode.getData().getName());
} else {
- order.setReservationAddress(address);
+ order.setReservationAddress(address+cityCode.getData().getName());
}
order.setTime(time);
order.setReservationRemark(reservationRemark);
--
Gitblit v1.7.1