From a0d4a6ac4c88754e3b0f8428510dc87a9a0dd03f Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期五, 23 八月 2024 17:40:50 +0800
Subject: [PATCH] 售后列表查询
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java | 3 ---
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java | 8 ++++----
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 16 ++++++++--------
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java | 3 +++
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
index 4b402bc..0296019 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
@@ -29,16 +29,16 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
- @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd")
private String orderStartDateStr;
- @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd")
private String orderEndDateStr;
- @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd")
private String salesStartDateStr;
- @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd")
private String salesEndDateStr;
@ApiModelProperty(value = "状态 ORDER_SALES_STATUS")
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
index 248072e..f55e432 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java
@@ -37,7 +37,4 @@
@ApiModelProperty(value = "下单时间")
private LocalDateTime orderTime;
- @ApiModelProperty(value = "审核时间")
- private LocalDateTime auditTime;
-
}
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
index 412be0d..26f7399 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
@@ -93,4 +93,7 @@
@ApiModelProperty(value = "平台回复")
private String remarks;
+
+ @ApiModelProperty(value = "审核时间")
+ private LocalDateTime auditTime;
}
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 5b7871e..3a8cc6e 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -172,10 +172,10 @@
}
public Page<OrderItemSalesNewListDTO> selectSalesList(Page page, OrderItemSalesQueryDTO dto){
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(page, dto);
@@ -184,10 +184,10 @@
}
public void exportSalesList(HttpServletResponse response, OrderItemSalesQueryDTO dto){
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
codeDecorator.decorate(ls);
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index aa11add..6b0d827 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,7 +71,7 @@
, oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
, o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
, o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
- , si.remarks, oi.supplier_price, oi.markup_partner
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
join t_order o on si.order_id = o.id
--
Gitblit v1.9.3