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 | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 15c4e98..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,10 +14,10 @@
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;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -89,7 +90,7 @@
// 娆℃暟闄愬埗
long count = lostOrderMapper.countTodayAppeal(lostOrder.getUserInfo().getId());
- String countMax = configService.get("order_appeal_count_day");
+ String countMax = configService.get(ConfigKeyEnum.orderAppealCountDay.getKey());
if (countMax != null && countMax.trim().length() > 0 && count >= Long.parseLong(countMax)) {
return -7;
}
@@ -315,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