diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index edf3dbd94..47bcfb500 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -276,7 +276,7 @@ public class EmisSettleBillController extends BaseController */ @GetMapping("/calculateRecedMoney") public AjaxResult calculateRecedMoney(String beginTime, String endTime) { - Map result = emisSettleBillService.calculateRecedMoney(beginTime, endTime); + List> result = emisSettleBillService.calculateRecedMoney(beginTime, endTime); return AjaxResult.success(result); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java index b75f7f58d..f2384fd67 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRecordMapper.java @@ -11,8 +11,12 @@ package com.xdadan.erp.emis.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisSettlePayRecord; +import org.apache.ibatis.annotations.Param; + /** * @ClassName EmisSettlePayRecordMapper * @Description

账单收退款记录 Mapper 接口

@@ -80,4 +84,13 @@ public interface EmisSettlePayRecordMapper extends BaseMapper> calculateRecedMoney(@Param("beginTime") String beginTime, @Param("endTime") String endTime); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java index 47aa051ba..2468e5937 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -137,5 +137,5 @@ public interface IEmisSettleBillService extends IDataAuditService * @param endTime 结束时间 * @return 每一天的收款总金额 */ - Map calculateRecedMoney(String beginTime, String endTime); + List> calculateRecedMoney(String beginTime, String endTime); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 0ac374adc..fdd0cb171 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -1125,28 +1125,17 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS } @Override - public Map calculateRecedMoney(String beginTime, String endTime) { - // 构建查询条件 - EmisSettleBill query = new EmisSettleBill(); - query.setParams(new HashMap<>()); - query.getParams().put("beginTime", beginTime); - query.getParams().put("endTime", endTime); - - // 查询符合条件的记录 - List list = emisSettleBillMapper.selectEmisSettleBillList(query); - - // 按天分组统计金额 - Map dailyAmounts = list.stream() - .filter(bill -> bill.getRecedMoney() != null && bill.getCreateTime() != null) - .collect(Collectors.groupingBy( - bill -> DateUtils.parseDateToStr("yyyy-MM-dd", bill.getCreateTime()), - Collectors.mapping( - EmisSettleBill::getRecedMoney, - Collectors.reducing(BigDecimal.ZERO, (a, b) -> { - BigDecimal sum = a.add(b).stripTrailingZeros(); - return new BigDecimal(sum.toPlainString()); - })))); + public List> calculateRecedMoney(String beginTime, String endTime) { + // 查询获取按天统计的已收款金额 + List> resultList = emisSettlePayRecordMapper.calculateRecedMoney(beginTime, endTime); + List> dailyAmounts = new ArrayList<>(); + for (Map result : resultList) { + Map item = new HashMap<>(); + item.put("tradeDay", (String) result.get("tradeDay")); + item.put("payMoney", result.get("payMoney").toString()); + dailyAmounts.add(item); + } return dailyAmounts; } diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml index 12686d564..77b4bf70e 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml @@ -381,4 +381,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file