From 67aa40955df674f33fbf5972c738ee1bfd50d2b0 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 31 八月 2024 17:01:03 +0800 Subject: [PATCH] 8.31 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java index 8013e2b..5802610 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java @@ -44,6 +44,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -507,6 +508,7 @@ PageInfo<TShoppingOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize()); List<TShoppingOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2); for (TShoppingOrder tShoppingOrder : list) { + tShoppingOrder.setUid(tShoppingOrder.getId().toString()); switch (tShoppingOrder.getOrderType()){ case 1: TGoods data = goodsClient.getGoodsById(tShoppingOrder.getGoodsId()).getData(); @@ -532,4 +534,16 @@ pageInfo.setRecords(list); return pageInfo; } + + @Override + public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) { + return this.baseMapper.sixBefore(sixBefore,status); + } + + @Override + public BigDecimal getSumAmount(LocalDate sixBefore) { + return this.baseMapper.getSumAmount(sixBefore); + } + + } -- Gitblit v1.7.1