From a183d2bfec0203d2dbca79b1e579e7a20340528c Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Thu, 15 Aug 2024 17:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E5=AF=BC=E5=87=BA=20--=20=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/TbOrderDetailRepository.java | 14 -------- .../service/impl/SummaryServiceImpl.java | 35 +------------------ 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java index 42df72f3..fe9f3be7 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java @@ -38,20 +38,6 @@ public interface TbOrderDetailRepository extends JpaRepository searchDetailByOrderIds(@Param("ids")List ids); - @Query(value = "SELECT " + - "new cn.ysk.cashier.vo.TbOrderSaleVO(oi.orderNo, od.num, od.price, od.status, 0)\n" + - "FROM\n" + - "TbOrderInfo oi\n" + - "LEFT JOIN TbOrderDetail od ON oi.id = od.orderId \n" + - "WHERE\n" + - "od.shopId = :shopId \n" + - "AND ( od.status = 'closed' OR od.status = 'refund' ) \n" + - "AND od.createTime > :startTime \n" + - "AND od.createTime < :endTime \n" + - "AND (:productId is null or od.productId = :productId)\n" + - "AND (:productId is null or od.productSkuId = :productSkuId)") - List querySaleOrderInfo(@Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("productId") Integer productId, @Param("productSkuId") Integer productSkuId, @Param("shopId") Integer shopId); - @Query("SELECT new cn.ysk.cashier.vo.TbOrderSalesCountByDayVo(" + "info.productName, info.productSkuName, cate.name, unit.name,info.price," + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index 47555a1c..b6ddca76 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -1,20 +1,15 @@ package cn.ysk.cashier.service.impl; -import cn.hutool.core.util.StrUtil; import cn.ysk.cashier.dto.ShopSummaryDto; import cn.ysk.cashier.dto.shop.ShopTableSeleInfoDto; import cn.ysk.cashier.enums.PayTypeEnum; import cn.ysk.cashier.exception.BadRequestException; -import cn.ysk.cashier.mybatis.mapper.TbOrderInfoMapper; import cn.ysk.cashier.mybatis.service.TbShopUserFlowService; -import cn.ysk.cashier.pojo.shop.TbShopTable; import cn.ysk.cashier.repository.ShopUserDutyDetailRepository; import cn.ysk.cashier.repository.ShopUserDutyRepository; import cn.ysk.cashier.repository.TbTokenRepository; import cn.ysk.cashier.repository.order.TbOrderDetailRepository; import cn.ysk.cashier.repository.order.TbOrderInfoRepository; -import cn.ysk.cashier.repository.shop.TbShopAreaRepository; -import cn.ysk.cashier.repository.shop.TbShopTableRepository; import cn.ysk.cashier.repository.shop.TbShopUserRepository; import cn.ysk.cashier.service.SummaryService; import cn.ysk.cashier.utils.DateUtil; @@ -36,13 +31,11 @@ import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; -import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.CopyOnWriteArraySet; import java.util.function.Function; import java.util.stream.Collectors; @@ -66,15 +59,8 @@ public class SummaryServiceImpl implements SummaryService { @Resource private TbShopUserFlowService tbShopUserFlowService; - - @Resource - private TbShopTableRepository shopTableRepository; - - @Resource - TbShopAreaRepository tbShopAreaRepository; @Autowired private TbOrderDetailRepository tbOrderDetailRepository; - private final TbOrderInfoMapper orderInfoMapper; @Override @@ -559,7 +545,7 @@ public class SummaryServiceImpl implements SummaryService { Map> countByTableMap = countByTables.stream() .collect(Collectors.groupingBy(TbOrderSalesCountByTable::getTableId)); - List> list = new ArrayList<>(); + ConcurrentLinkedQueue> list = new ConcurrentLinkedQueue<>(); ArrayList mergeRowIndex = new ArrayList<>(); for (ShopTableSaleInfoVo all : infoVos) { @@ -580,27 +566,9 @@ public class SummaryServiceImpl implements SummaryService { map.put("商品规格", table.getProductSkuName()); map.put("销量", table.getSalesNum()); map.put("销售额", table.getSalesAmount()); -// map.put("订单数量", all.getOrderCount()); -// map.put("销售额", all.getOrderAmount()); -// map.put("商品名称", table.getProductName()); -// map.put("销售数量", table.getSalesNum()); list.add(map); } - - -// Map map = new LinkedHashMap<>(); -// -// map.put("开始时间", shopTableSeleInfoDto.getStartTime()); -// map.put("结束时间", shopTableSeleInfoDto.getEndTime()); -// map.put("区域名称", all.getAreaName()); -// map.put("桌台名称", all.getTableName()); -// map.put("订单数量", all.getOrderCount()); -// map.put("销售额", all.getOrderAmount()); -// -// list.add(map); - - if (!tables.isEmpty()) { if (mergeRowIndex.isEmpty()) { mergeRowIndex.add(tables.size()); @@ -609,7 +577,6 @@ public class SummaryServiceImpl implements SummaryService { } } } -// FileUtil.downloadExcel(list, response); FileUtil.downloadExcelAndMerge(list, 4, response, mergeRowIndex); } }