From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index 19fc51c..baa0a3b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.order;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -13,7 +14,6 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
@@ -316,15 +316,13 @@
}
@Override
- public List<ChartTDO> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
- String endTime) throws Exception {
- return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
+ public Integer countLostOrderNum(String preDay) {
+ return lostOrderMapper.countLostOrderNum(preDay);
}
@Override
- public List<ChartTDO> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
- throws Exception {
- return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
+ public BigDecimal countAppealMoney(String preDay) {
+ return lostOrderMapper.countAppealMoney(preDay);
}
@Override
--
Gitblit v1.8.0