From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..09c2f87 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
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.count;
+import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
@@ -147,12 +148,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 +224,26 @@
}
+ @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 BigDecimal getMoneyByOrderNo(String orderNo) {
+ return commonOrderCountMapper.getMoneyByOrderNo(orderNo);
+ }
+
}
--
Gitblit v1.8.0