From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderUserStatisticService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderUserStatisticService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderUserStatisticService.java
index 753905f..30714d3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderUserStatisticService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderUserStatisticService.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.inter.order;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 鐢ㄦ埛璁㈠崟缁熻鏈嶅姟
@@ -10,12 +11,13 @@
*/
public interface OrderUserStatisticService {
/**
- * 杩斿埄瓒呰繃瓒呰繃50鍏冪殑璁㈠崟鏁伴噺
+ * 璁㈠崟浣ｉ噾澶т簬100鐨勬暟閲忥紙澶т簬鏌愪釜鏈�灏忔椂闂达級
*
* @param uid
+ * @param minTime
* @return
*/
- public int countHongBaoOrderCount50MoreByUid(Long uid);
+ public int countOrderCount100MoreByUidAndMinTime(Long uid, Date minTime);
/**
* 缁存潈璁㈠崟鏁伴噺锛堝寘鍚個璇疯禋锛�
@@ -23,7 +25,7 @@
* @param uid
* @return
*/
- public int countWeiQuanOrderByUid(Long uid);
+ public int countWeiQuanOrderByUid(Long uid, Date minTime);
/**
* 缁存潈璁㈠崟杩旇繕鐨勯噾棰�
@@ -31,14 +33,15 @@
* @param uid
* @return
*/
- public BigDecimal sumWeiQuanOrderFanAmountByUid(Long uid);
+ public BigDecimal sumWeiQuanOrderFanAmountByUid(Long uid,Date minTime);
/**
- * 瀹夊叏璁㈠崟鏁伴噺
- *
+ * 缁存潈璁㈠崟鏁伴噺
* @param uid
+ * @param minMoney
+ * @param minTime
* @return
*/
- public int countSafeOrderByUid(Long uid);
+ public int countWeiQuanOrderWithMinCommision(Long uid, BigDecimal minMoney, Date minTime);
}
--
Gitblit v1.8.0