From 90ab70ee2e1adc5f6f2cf3cac38df14b61568ba1 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 11 八月 2024 22:54:13 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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..5cda282 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
@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.GaoDeMapUtil;
import com.ruoyi.common.core.vo.AddressDto;
+import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.entity.ChangeDispatch;
import com.ruoyi.order.entity.Order;
@@ -89,18 +90,21 @@
// 计算订单总额及总订单数量
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();
- }
- return new
+ fakeNumber = list.stream().filter(order -> order.getFakeCount() != null)
+ .mapToInt(OrderQueryVO::getFakeCount).sum();
- OrderResultVO(totalMoney, orderNumber, list);
+ }
+ return new OrderResultVO(totalMoney, orderNumber, list,fakeNumber);
}
@@ -277,7 +281,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 +299,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 +335,9 @@
order.setReservationName(reservationName);
order.setReservationPhone(reservationPhone);
if (null == userOrderRequest.getAddressId()) {
- order.setReservationAddress(addressDetail);
+ order.setReservationAddress(cityCode.getData().getName()+address+cityCode.getData().getDetail());
} else {
- order.setReservationAddress(address);
+ order.setReservationAddress(address+cityCode.getData().getName()+cityCode.getData().getDetail());
}
order.setTime(time);
order.setReservationRemark(reservationRemark);
@@ -342,13 +352,18 @@
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);
return String.valueOf(order.getId());
}
+ @Override
+ public List<PaperInVo> papercout(String workId,String date) {
+ return this.baseMapper.papercout(workId,date);
+ }
+
/**
* 根据当前月份获取当前季度的开始月份
*/
--
Gitblit v1.7.1