czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test

This commit is contained in:
wangw 2024-09-29 09:30:39 +08:00
parent ffe39b3113 d1d42e8fdf
commit 4e14710e3d
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderInfoRepository.java
View File

@ -128,7 +128,7 @@ public interface TbOrderInfoRepository extends JpaRepository<TbOrderInfo, Intege
@Param("currentPage") Integer currentPage, @Param("currentSize") Integer currentSize);
@Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay " +
@Query(value = "SELECT ifnull( sum( order_amount ), 0 ) AS amount,trade_day as tradeDay ,ifnull( sum(discount_amount), 0 ) AS saveAmount " +
"FROM tb_order_info WHERE shop_id = :shopId AND ((status = 'closed') OR ( status ='refund' AND order_type != 'return' ))" +
"AND trade_day BETWEEN :startTime AND :endTime " +
"GROUP BY shop_id,trade_day", nativeQuery = true)

6
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@ -239,6 +239,7 @@ public class SummaryServiceImpl implements SummaryService {
SumDateVO sumDateVO = new SumDateVO();
sumDateVO.setAmount((BigDecimal) o[0]);
sumDateVO.setTradeDay((String) o[1]);
sumDateVO.setSaveAmount((BigDecimal) o[2]);
sumDateVOList.add(sumDateVO);
}
//填充日期
@ -246,7 +247,8 @@ public class SummaryServiceImpl implements SummaryService {
for (SumDateVO entry : sumDateVOList) {
String tradeDay = entry.getTradeDay();
BigDecimal amount = entry.getAmount();
dataMap.put(tradeDay, new SumDateVO(tradeDay, amount));
BigDecimal saveAmount = entry.getSaveAmount();
dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount));
}
// 获取今天的日期
LocalDate today = LocalDate.now();
@ -263,7 +265,7 @@ public class SummaryServiceImpl implements SummaryService {
sumDateVO = dataMap.get(tradeDayString);
} else {
// 如果不存在，则创建新的SumDateVO对象，amount设为0
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO);
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO);
}
// 将SumDateVO对象添加到列表中
sumDateList.add(sumDateVO);

14
eladmin-system/src/main/java/cn/ysk/cashier/vo/SumDateVO.java
View File

@ -13,6 +13,7 @@ import java.time.LocalDate;
public class SumDateVO {
private String tradeDay;
private BigDecimal amount;
private BigDecimal saveAmount;
public SumDateVO() {
@ -34,8 +35,19 @@ public class SumDateVO {
this.amount = amount;
}
public SumDateVO(String tradeDay, BigDecimal amount) {
public BigDecimal getSaveAmount() {
return saveAmount;
}
public void setSaveAmount(BigDecimal saveAmount) {
this.saveAmount = saveAmount;
}
public SumDateVO(String tradeDay, BigDecimal amount, BigDecimal saveAmount) {
this.tradeDay = tradeDay;
this.amount = amount;
this.saveAmount = saveAmount;
}
}