From e718b00c64088cab2b4999a9e0885ab72701f552 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 22 九月 2024 21:03:49 +0800
Subject: [PATCH] 452 退款后花店端才展示质检结果
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 11 +++++++++++
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java | 3 +++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
index ca40541..4cfad0b 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
@@ -73,4 +73,7 @@
@ApiModelProperty(value = "收货地址详细地址（拼接省市区地址）")
private String address;
+
+ @ApiModelProperty(hidden = true)
+ private boolean customerQuery = false;
}
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 681a6fd..68f2395 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -868,9 +868,11 @@
List<OrderListDTO> ls = getOrderListBase(page, dto);
if (ls != null && ls.size() > 0) {
List<String> orderIds = new ArrayList<>();
+ Map<String, OrderListDTO> orderMap = new HashMap<>();
for (OrderListDTO o : ls) {
o.setCouldRefund(couldRefund(o.getStatusBackend(), o.getPaymentTime()));
orderIds.add(o.getId());
+ orderMap.put(o.getId(), o);
}
List<OrderItemListDTO> itemList = orderItemMapper.getOrderItems(orderIds);
@@ -880,6 +882,14 @@
List<OrderItemListDTO> ll = map.computeIfAbsent(orderId, k -> new ArrayList<>());
OrderItemListDTO d = new OrderItemListDTO();
BeanUtils.copyProperties(oi, d);
+
+ OrderListDTO o = orderMap.get(orderId);
+ if(dto.isCustomerQuery() && o != null && StringUtils.isEmpty(o.getTransferId())){
+ d.setReduceNum(0);
+ d.setLackNum(0);
+ d.setReplaceNum(0);
+ }
+
ll.add(d);
}
@@ -1058,6 +1068,7 @@
public Page<OrderListDTO> selectCustomerOrderList(Page page, OrderQueryDTO dto) {
dto.setCreateBy(SecurityUtils.getUserId());
+ dto.setCustomerQuery(true);
return selectOrderList(page, dto);
}
--
Gitblit v1.9.3