From c8ea01fdd9fc8ebf5e1fcbbd56fee7071e4d5809 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 14:45:05 +0800
Subject: [PATCH] 583-订单管理-订单列表统计页面增加一个，筛选地区的下拉列表，例如昆明-呈贡区等等
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index 7fddc66..84d02ec 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -50,7 +50,7 @@
private OrderItemMapper orderItemMapper;
@Autowired
- private UserPaymentSybService paymentSybService;
+ private UserPaymentV3Service paymentV3Service;
@Autowired
private SequenceNo sequenceNo;
@@ -197,6 +197,7 @@
dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
+ dto.setStatusList(splitParam(dto.getStatus()));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(page, dto);
@@ -209,6 +210,7 @@
dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
+ dto.setStatusList(splitParam(dto.getStatus()));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
codeDecorator.decorate(ls);
@@ -447,7 +449,7 @@
if(Constants.ORDER_SALES_STATUS.AGREED.name().equals(sl.getStatus())){
if(totalFeeWithPacking.doubleValue() > 0) {
- String refundId = paymentSybService.refundOrderSub(o, totalFeeWithPacking);
+ String refundId = paymentV3Service.refundOrderSub(o, totalFeeWithPacking);
sl.setRefundId(refundId);
}
}
--
Gitblit v1.9.3