From a8d85088e174a2bc037d00ac06311192acd75f94 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 13 九月 2024 19:40:58 +0800
Subject: [PATCH] 同城配送
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 18d752e..2ef01ff 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -460,7 +460,7 @@
if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
totalAmount = new BigDecimal(0.01);
}
- order.setTotalAmount(totalAmount.add(p.getPacking()).add(transportFee));
+ order.setTotalAmount(totalAmount);
order.setCustomer(address.getName());
order.setCustomerTel(address.getTel());
@@ -802,10 +802,9 @@
orderIds.add(o.getId());
}
- List<OrderItem> itemList = orderItemMapper.selectList(
- new QueryWrapper<OrderItem>().in("order_id", orderIds));
+ List<OrderItemListDTO> itemList = orderItemMapper.getOrderItems(orderIds);
Map<String, List<OrderItemListDTO>> map = new HashMap<>();
- for (OrderItem oi : itemList) {
+ for (OrderItemListDTO oi : itemList) {
String orderId = oi.getOrderId();
List<OrderItemListDTO> ll = map.computeIfAbsent(orderId, k -> new ArrayList<>());
OrderItemListDTO d = new OrderItemListDTO();
@@ -929,8 +928,9 @@
if(llc == null){
llc = new OrderCheckLocationListDTO();
BeanUtils.copyProperties(c, llc);
- rMap.put(locationId, llc);
+ llc.setTotalAmount(new BigDecimal(0));
+ rMap.put(locationId, llc);
result.add(llc);
}
--
Gitblit v1.9.3