From 68db9741703e4bed67e02d21d2a944cc53e9c1d0 Mon Sep 17 00:00:00 2001
From: tangqian <tangqian..110>
Date: Thu, 15 Jun 2023 09:41:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA(=E6=9C=AA=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E4=BD=86=E6=98=AF=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=89=E9=87=91=E9=A2=9D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/statement/StatementController.java  | 9 +++------
 .../shop/service/order/impl/StoreOrderServiceImpl.java   | 5 -----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/statement/StatementController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/statement/StatementController.java
index 933e7939d..6c5879602 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/statement/StatementController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/statement/StatementController.java
@@ -1,15 +1,13 @@
 package cn.iocoder.yudao.module.shop.controller.admin.statement;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
-import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
-import cn.iocoder.yudao.module.shop.convert.recharge.RechargeGearConvert;
-import cn.iocoder.yudao.module.shop.dal.dataobject.order.StoreOrderStatus;
-import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeGearDO;
+import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatementAllReqVo;
+import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatisticsExcelVO;
+import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.StatisticsPageVo;
 import cn.iocoder.yudao.module.shop.request.order.StatementAllRequest;
 import cn.iocoder.yudao.module.shop.request.order.StatementPageRequest;
 import cn.iocoder.yudao.module.shop.service.order.StoreOrderService;
@@ -18,7 +16,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
index 6ad67e47a..9dda4357b 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@@ -1463,11 +1463,6 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
                 request.setEndTime(LocalDateTimeUtil.endOfDay(lastDay));
             }
         }
-        LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7);
-        LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1);
-        LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1);
-        request.setStartTime(LocalDateTimeUtil.beginOfDay(monday));
-        request.setEndTime(LocalDateTimeUtil.endOfDay(sunday));
         List<StatementAllReqDataVo> dataVos = mapper.statisticsAll(request.getStartTime(), request.getEndTime());
         if (!CollectionUtils.isEmpty(dataVos)) {
             reqVo.setTotalMoney(BigDecimal.valueOf(dataVos.stream().filter(x -> x.getRefundStatus() != 2).mapToDouble(StatementAllReqDataVo::getPrice).sum()));