From 56a7e539628f35d350532e8afcb51e39d9cd0cf9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 11:31:10 +0800
Subject: [PATCH] fix:补充花农报表
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 86 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 a915f65..3d6bcd6 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,6 +3,9 @@
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;
@@ -15,14 +18,13 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
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;
@@ -203,51 +205,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", "合伙人","底价"
, "合伙人加价", "会员折扣","优惠券","售后扣合伙人款","总包干费","实际销售扎数"};
@@ -257,7 +229,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(); // 合伙人底价
@@ -271,9 +243,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) {
@@ -281,6 +253,78 @@
}
}
+ @Override
+ public Page<OrderSupplierReportResultVO> getOrderSupplierPage(Page page, QuerySupplierDTO dto) {
+ SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
+ if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
+ throw new ValidationException("日期不能为空");
+ }
+ supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
+ supplierReportCalendarBO.setStartDate(dto.getStartDate());
+ supplierReportCalendarBO.setEndDate(dto.getEndDate());
+ List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierPageReport(supplierReportCalendarBO, page);
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public OrderSupplierReportResultVO getOrderSupplierClout(QuerySupplierDTO dto) {
+ SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
+ if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
+ throw new ValidationException("日期不能为空");
+ }
+ supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
+ supplierReportCalendarBO.setStartDate(dto.getStartDate());
+ supplierReportCalendarBO.setEndDate(dto.getEndDate());
+ OrderSupplierReportResultVO orderSupplierCountReport = orderReportMapper.getOrderSupplierCountReport(supplierReportCalendarBO);
+ return orderSupplierCountReport;
+ }
+
+
+ @Override
+ public void exportSupplierList(HttpServletResponse response, QuerySupplierDTO dto) {
+ SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
+ if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
+ throw new ValidationException("日期不能为空");
+ }
+ supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
+ supplierReportCalendarBO.setStartDate(dto.getStartDate());
+ supplierReportCalendarBO.setEndDate(dto.getEndDate());
+ List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierReport(supplierReportCalendarBO);
+
+ String[] rowsName = new String[]{"序号","日期", "供应商ID", "供应商","花农底价"
+ , "降级扣款", "缺货扣款（缺货+补货）","售后扣花农款","实际销售扎数","结算费用","订单状态"};
+ List<Object[]> dataList = new ArrayList<>();
+ int sn = 1;
+ for (OrderSupplierReportResultVO o : list) {
+ if(!ObjectUtils.isEmpty(o)) {
+ Object[] objs = new Object[rowsName.length];
+ int a = 0;
+ objs[a++] = sn; // 序号
+ objs[a++] = format(o.getDateinfo(), "yyyy-MM-dd"); // 日期
+ objs[a++] = o.getSupplierId(); // 供应商ID
+ objs[a++] = o.getSupplierName(); // 供应商
+ objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价
+ objs[a++] = o.getOrderCheckFee(); //降级扣款
+ objs[a++] = o.getOrderLackFeeSupplier();//缺货扣款
+ objs[a++] = o.getSalesFeeSupplier(); // 售后扣花农款
+ objs[a++] = o.getRealSaleNum(); // 实际销售扎数
+ objs[a++] = o.getProfitFeeAmount(); // 结算费用
+ objs[a++] = o.getSettleStatus(); // 订单状态
+ dataList.add(objs);
+ sn++;
+ }
+ }
+
+ ExcelExportUtil excelExportUtil = new ExcelExportUtil("花农结算报表", rowsName, dataList, response);
+ try {
+ response.addHeader("filename", URLEncoder.encode("花农结算报表.xls", "UTF-8"));
+ response.addHeader("Access-Control-Expose-Headers", "filename");
+ excelExportUtil.export();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ }
// 计算 startDate 的前一天 17:00:00
public static LocalDateTime calculateStartTime(LocalDateTime startDateTime) {
// 获取 LocalDate 部分
--
Gitblit v1.9.3