From 30a832ddbab4fa85ac3a831f5d1c9e45d8d82bb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 22 三月 2019 15:29:09 +0800
Subject: [PATCH] Bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index 0f22393..43804d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -147,12 +147,14 @@
List<Map<String, Object>> result_list = null;
+ // 鐢ㄦ埛璁㈠崟
List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,
startTime, endTime);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
}
+ // 娣樺疂鑱旂洘
List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year,
startTime, endTime);
@@ -221,7 +223,33 @@
}
+ @Override
+ public Map<String, Object> countOrderNumberBySettleTime(Long uid, Integer state, Integer day) {
+ return commonOrderCountMapper.countOrderNumberBySettleTime(uid, state, day);
+ }
+ /**
+ * 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
+ * @param uid
+ * @return
+ */
+ @Override
+ public Map<String, Object> lastMonthSettleOrderNumber(Long uid) {
+ return countOrderNumberBySettleTime(uid, 2, 4); // 鏍规嵁
+ }
+
+ @Override
+ public boolean hasRebateAndShareOrder(Long uid) {
+ boolean has = false;
+
+ long count = commonOrderCountMapper.countValidOrder(uid);
+ if (count > 0) {
+ has = true;
+ }
+
+ return has;
+ }
+
}
--
Gitblit v1.8.0