From 11c95afd1e44bcd3d70dbcf77e790596ec80a53e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 24 九月 2024 18:54:59 +0800
Subject: [PATCH] fix: 剔除加价限制条件
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 11ee635..fe2bdb3 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -161,10 +161,10 @@
}
public List<OrderStatusCountDTO> getSalesStatusCount(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<CodeValueDTO> ls = codeService.searchValue("ORDER_SALES_STATUS");
List<OrderStatusCountDTO> ll = orderItemSalesMapper.getSalesStatusCount(dto);
@@ -210,15 +210,17 @@
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
codeDecorator.decorate(ls);
- String[] rowsName = new String[]{"集货站", "商品名称", "商品单位", "商品颜色", "商品等级"
+ String[] rowsName = new String[]{"序号", "集货站", "商品名称", "商品单位", "商品颜色", "商品等级"
, "商品分类", "收货人", "收货人手机号码", "收货地址", "商品数量", "供应商名称", "商品售价"
, "总金额", "订单号", "售后单号", "标题", "申请数量", "理由", "实际退款", "审核结果"
, "申请时间", "平台回复"};
List<Object[]> dataList = new ArrayList<>();
+ int sn = 1;
for (OrderItemSalesNewListDTO d : ls) {
Object[] objs = new Object[rowsName.length];
int a = 0;
+ objs[a++] = sn;
objs[a++] = d.getStationName();
objs[a++] = d.getFlowerName();
objs[a++] = d.getFlowerUnit();
@@ -227,7 +229,7 @@
objs[a++] = d.getFlowerCategory();
objs[a++] = d.getCustomer();
objs[a++] = d.getCustomerTel();
- objs[a++] = d.getCustomerAddress();
+ objs[a++] = d.getCustomerProvince() + d.getCustomerCity() + d.getCustomerRegion() + d.getCustomerAddress();
objs[a++] = d.getFlowerNum();
objs[a++] = d.getSupplierName();
objs[a++] = d.getPrice();
@@ -243,6 +245,8 @@
objs[a++] = d.getRemarks();
dataList.add(objs);
+
+ sn++;
}
ExcelExportUtil excelExportUtil = new ExcelExportUtil("售后申请列表", rowsName, dataList, response);
--
Gitblit v1.9.3