From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 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 1d0294f..2f63b16 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;
@@ -220,10 +221,28 @@
 	public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
 			String endTime) throws Exception{
 		return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
-		
+	}
+	
+	@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