From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 7847416..15c4e98 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
@@ -13,6 +13,7 @@
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;
@@ -314,13 +315,13 @@
}
@Override
- public List<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
+ public List<ChartTDO> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
String endTime) throws Exception {
return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
+ public List<ChartTDO> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
throws Exception {
return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
}
--
Gitblit v1.8.0