From 08f01e04ea88756bcf1043ab7df58e1c6045f33f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sun, 29 Sep 2024 10:01:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=20=E5=B7=A6=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/mnt/util/SqlUtils.java | 1 - .../service/impl/SummaryServiceImpl.java | 22 ++++------- .../java/cn/ysk/cashier/vo/SumDateVO.java | 39 +++++++++++-------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java index 7555069e..0ae7643f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mnt/util/SqlUtils.java @@ -6,7 +6,6 @@ import com.alibaba.druid.util.StringUtils; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import cn.ysk.cashier.utils.CloseUtil; -import cn.ysk.cashier.mnt.util.DataTypeEnum; import javax.sql.DataSource; import java.io.BufferedReader; import java.io.File; 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 74cc6a30..518daffd 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 @@ -238,22 +238,16 @@ public class SummaryServiceImpl implements SummaryService { List objects = tbOrderInfoRepository.queryTbOrderPaySumByDay(shopId.toString(), startTime, endTime); //根据时间的销量 - List sumDateVOList = new ArrayList<>(); + Map dataMap = new HashMap<>(); for (Object[] o : objects) { SumDateVO sumDateVO = new SumDateVO(); - sumDateVO.setAmount((BigDecimal) o[0]); + sumDateVO.setOrderAmount((BigDecimal) o[0]); sumDateVO.setTradeDay((String) o[1]); - sumDateVO.setSaveAmount((BigDecimal) o[2]); - sumDateVOList.add(sumDateVO); - } - //填充日期 - Map dataMap = new HashMap<>(); - for (SumDateVO entry : sumDateVOList) { - String tradeDay = entry.getTradeDay(); - BigDecimal amount = entry.getAmount(); - BigDecimal saveAmount = entry.getSaveAmount(); - dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount)); + sumDateVO.setDiscountAmount((BigDecimal) o[2]); + sumDateVO.setActualAmount(sumDateVO.getOrderAmount().subtract(sumDateVO.getDiscountAmount())); + dataMap.put(sumDateVO.getTradeDay(), sumDateVO); } + // 获取今天的日期 LocalDate today = LocalDate.now(); // 定义日期格式 @@ -269,12 +263,12 @@ public class SummaryServiceImpl implements SummaryService { sumDateVO = dataMap.get(tradeDayString); } else { // 如果不存在，则创建新的SumDateVO对象，amount设为0 - sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO); + sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO,BigDecimal.ZERO, BigDecimal.ZERO); } // 将SumDateVO对象添加到列表中 sumDateList.add(sumDateVO); } - sumDateList.sort((a, b) -> a.getTradeDay().compareTo(b.getTradeDay())); + sumDateList.sort(Comparator.comparing(SumDateVO::getTradeDay)); map.put("total", sumDateList); return map; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java index 4e72910a..7f5f6024 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java @@ -3,7 +3,6 @@ package cn.ysk.cashier.vo; import lombok.Data; import java.math.BigDecimal; -import java.time.LocalDate; /** * @author lyf @@ -12,13 +11,21 @@ import java.time.LocalDate; @Data public class SumDateVO { private String tradeDay; - private BigDecimal amount; - private BigDecimal saveAmount; + private BigDecimal orderAmount; + private BigDecimal actualAmount; + private BigDecimal discountAmount; public SumDateVO() { } + public SumDateVO(String tradeDay, BigDecimal orderAmount, BigDecimal actualAmount, BigDecimal discountAmount) { + this.tradeDay = tradeDay; + this.orderAmount = orderAmount; + this.actualAmount = actualAmount; + this.discountAmount = discountAmount; + } + public String getTradeDay() { return tradeDay; } @@ -27,27 +34,27 @@ public class SumDateVO { this.tradeDay = tradeDay; } - public BigDecimal getAmount() { - return amount; + public BigDecimal getOrderAmount() { + return orderAmount; } - public void setAmount(BigDecimal amount) { - this.amount = amount; + public void setOrderAmount(BigDecimal orderAmount) { + this.orderAmount = orderAmount; } - - public BigDecimal getSaveAmount() { - return saveAmount; + public BigDecimal getActualAmount() { + return actualAmount; } - public void setSaveAmount(BigDecimal saveAmount) { - this.saveAmount = saveAmount; + public void setActualAmount(BigDecimal actualAmount) { + this.actualAmount = actualAmount; } + public BigDecimal getDiscountAmount() { + return discountAmount; + } - public SumDateVO(String tradeDay, BigDecimal amount, BigDecimal saveAmount) { - this.tradeDay = tradeDay; - this.amount = amount; - this.saveAmount = saveAmount; + public void setDiscountAmount(BigDecimal discountAmount) { + this.discountAmount = discountAmount; } } From bfb9f826597f683eb8ca2d6fd58fe77afcbc1b70 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sun, 29 Sep 2024 10:29:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=9D=BF=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java | 2 +- .../cn/ysk/cashier/repository/shop/TbShopTableRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java index 6a818edd..d301887e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java @@ -30,7 +30,7 @@ public interface TbShopUserFlowMapper extends BaseMapper { " LEFT JOIN ( " + " SELECT shop_user_id, SUM(amount) AS total_amount " + " FROM tb_shop_user_flow " + - " WHERE biz_code IN ('cashMemberIn','scanMemberIn', 'scanMemberAwardIn') " + + " WHERE biz_code IN ('cashMemberIn', 'inMoneyIn', 'scanMemberIn') " + " AND create_time BETWEEN #{startTime} AND #{endTime} " + " GROUP BY shop_user_id " + " ) AS flow ON flow.shop_user_id = a.id " + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java index 6a29053b..3316ae98 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbShopTableRepository.java @@ -17,7 +17,7 @@ import java.util.List; **/ public interface TbShopTableRepository extends JpaRepository, JpaSpecificationExecutor { - @Query + @Query("select count(1) from TbShopTable table where table.shopId = :shopId") int countAllByShopId(@Param("shopId")Integer shopId); @Query("select table from TbShopTable table where table.qrcode = :qrcode")