From bb85777893c0a112d6b69b016d409ac37940d20c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:48:37 +0800
Subject: [PATCH] fix:
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 57 +++++++++++++++------------------------------------------
1 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
index d71bd92..6b30c09 100644
--- a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
+import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO;
import com.mzl.flower.dto.request.report.QuerySupplierDTO;
import com.mzl.flower.dto.response.report.*;
+import com.mzl.flower.dto.response.report.OrderDetailReportResultVO;
+import com.mzl.flower.dto.response.report.OrderPartnerReportResultVO;
+import com.mzl.flower.dto.response.report.OrderReportCalendarBO;
+import com.mzl.flower.dto.response.report.OrderReportResultVO;
import com.mzl.flower.mapper.report.OrderReportMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.calendar.CalendarService;
@@ -17,10 +22,8 @@
import javax.servlet.http.HttpServletResponse;
import java.net.URLEncoder;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -201,51 +204,21 @@
}
@Override
- public Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryOrderDTO dto) {
- List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDatePage(page,dto);
-
- final List<OrderPartnerReportResultVO> list = calendarBOList.stream().map(calendarBO -> {
- if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId());
-// if(null!=dto.getPartnerFlag()) calendarBO.setPartnerFlag(dto.getPartnerFlag());
- // 查询合伙人
- calendarBO.setPartnerFlag(1);
- OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReport(calendarBO);
- if(null==vo2) vo2=new OrderPartnerReportResultVO();
- vo2.setOrderDate(calendarBO.getCalDate());
-
- return vo2;
- }).collect(Collectors.toList());
-
- page.setRecords(list);
- return page;
+ public Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto) {
+ Page<OrderPartnerReportResultVO> result=orderReportMapper.getPartnerOrderDateReportPage(page,dto);
+ return result;
}
@Override
- public OrderPartnerReportResultVO getPartnerSaleStatis(QueryOrderDTO dto) {
-
- OrderReportCalendarBO bo=new OrderReportCalendarBO();
- if(null!=dto.getPartnerId()) bo.setPartnerId(dto.getPartnerId());
- bo.setStartDate(calculateStartTime(dto.getStartDate()));
- bo.setEndDate(calculateEndTime(dto.getEndDate()));
- OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReportStatis(bo);
-
+ public OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO dto) {
+ OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReportStatis(dto);
return vo2;
}
@Override
- public void exportPartnerSalesList(HttpServletResponse response, QueryOrderDTO dto) {
- List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDateList(dto);
- final List<OrderPartnerReportResultVO> list = calendarBOList.stream().map(calendarBO -> {
- if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId());
-// if(null!=dto.getPartnerFlag()) calendarBO.setPartnerFlag(dto.getPartnerFlag());
- // 查询合伙人
- calendarBO.setPartnerFlag(1);
- OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReport(calendarBO);
- if(null==vo2) vo2=new OrderPartnerReportResultVO();
- vo2.setOrderDate(calendarBO.getCalDate());
+ public void exportPartnerSalesList(HttpServletResponse response, QueryPartnerOrderDTO dto) {
+ List<OrderPartnerReportResultVO> list = orderReportMapper.getPartnerOrderDateReportList(dto);
- return vo2;
- }).collect(Collectors.toList());
String[] rowsName = new String[]{"序号","下单日期", "合伙人ID", "合伙人","底价"
, "合伙人加价", "会员折扣","优惠券","售后扣合伙人款","总包干费","实际销售扎数"};
@@ -255,7 +228,7 @@
Object[] objs = new Object[rowsName.length];
int a = 0;
objs[a++] = sn; // 序号
- objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 下单日期
+ objs[a++] = o.getOrderDate(); // 下单日期
objs[a++] = o.getPartnerId(); // 合伙人ID
objs[a++] = o.getPartnerName(); // 合伙人
objs[a++] = o.getOrderPartnerPriceAmount(); // 合伙人底价
@@ -269,9 +242,9 @@
sn++;
}
- ExcelExportUtil excelExportUtil = new ExcelExportUtil("财务报表", rowsName, dataList, response);
+ ExcelExportUtil excelExportUtil = new ExcelExportUtil("合伙人财务报表", rowsName, dataList, response);
try {
- response.addHeader("filename", URLEncoder.encode("财务报表.xls", "UTF-8"));
+ response.addHeader("filename", URLEncoder.encode("合伙人财务报表.xls", "UTF-8"));
response.addHeader("Access-Control-Expose-Headers", "filename");
excelExportUtil.export();
} catch (Exception e) {
--
Gitblit v1.9.3