From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 09:34:49 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 3e416ab..59e4796 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
@@ -89,18 +89,23 @@
// 计算订单总额及总订单数量
BigDecimal totalMoney;
int orderNumber;
+ int fakeNumber;
if (list.isEmpty()) {
totalMoney = BigDecimal.ZERO;
orderNumber = 0;
+ fakeNumber = 0;
} else {
totalMoney = list.stream().map(OrderQueryVO::getTotalPrice)
.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
orderNumber = list.stream().filter(order -> order.getNumber() != null)
.mapToInt(OrderQueryVO::getNumber).sum();
+ fakeNumber = list.stream().filter(order -> order.getFakeCount() != null)
+ .mapToInt(OrderQueryVO::getNumber).sum();
+
}
return new
- OrderResultVO(totalMoney, orderNumber, list);
+ OrderResultVO(totalMoney, orderNumber, list,fakeNumber);
}
@@ -331,9 +336,9 @@
order.setReservationName(reservationName);
order.setReservationPhone(reservationPhone);
if (null == userOrderRequest.getAddressId()) {
- order.setReservationAddress(addressDetail+cityCode.getData().getName());
+ order.setReservationAddress(cityCode.getData().getName()+address+cityCode.getData().getDetail());
} else {
- order.setReservationAddress(address+cityCode.getData().getName());
+ order.setReservationAddress(address+cityCode.getData().getName()+cityCode.getData().getDetail());
}
order.setTime(time);
order.setReservationRemark(reservationRemark);
@@ -348,7 +353,7 @@
order.setLatitude(latitude);
order.setIsWithdrawal(Constants.ZERO);
order.setSubsidy(subsidy);
- order.setAddress(addressDetail);
+ order.setAddress("");
order.setCity(cityCode.getData().getCity());
order.setCityCode(cityCode.getData().getCityCode());
this.save(order);
--
Gitblit v1.7.1