From af4933b5015978729ffa69896b6c913eae3b035c Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 12 Jun 2023 15:40:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E8=AE=A2=E5=8D=95=E6=97=A5=E6=8A=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/SettleOrderReportServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 91fcddf12..8ee37b232 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -1,6 +1,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.SettleOrderReport; import com.jsowell.pile.dto.MerchantOrderReportDTO; import com.jsowell.pile.mapper.SettleOrderReportMapper; @@ -11,6 +12,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -99,6 +101,12 @@ public class SettleOrderReportServiceImpl implements ISettleOrderReportService { */ @Override public MerchantOrderReportVO getMerchantOrderReport(MerchantOrderReportDTO dto) { + if (StringUtils.isBlank(dto.getStartTime())) { + dto.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.addDays(new Date(), -7))); + } + if (StringUtils.isBlank(dto.getEndTime())) { + dto.setEndTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date())); + } MerchantOrderReportVO vo = new MerchantOrderReportVO(); MerchantOrderReportVO.MerchantOrderReport report = new MerchantOrderReportVO.MerchantOrderReport(); List list = settleOrderReportMapper.getMerchantOrderReport(dto);