From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 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 9c6d9f2..63fc1fa 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
@@ -54,8 +54,7 @@
} else if (orderList.get(0).getState() == 1
&& orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
return -1;
- } else if (orderList.get(0).getState() == 1
- && orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_FAIL) {
+ } else {
return -6;
}
}
@@ -278,4 +277,19 @@
public long countQuery(String key, Integer state, Integer handleType) {
return lostOrderMapper.countQuery(key, state, handleType);
}
+
+
+ @Override
+ public List<Map<String, Object>> 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) throws Exception {
+ return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
+ }
+
}
--
Gitblit v1.8.0