From 2bb5bd3c989dcdb07779e3d870d567cd8a06ffa5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 18:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 42908c3..06e1260 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -425,4 +425,13 @@
 	 */
 	public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid);
 
+	
+	/**
+	 * 缁熻璁㈠崟璁板綍鏁伴噺-闈炶鍗曞彿涓轰富
+	 * @param uid
+	 * @param payment
+	 * @return
+	 */
+	public long countOrderByUidAndSettled(Long uid, BigDecimal payment);
+
 }

--
Gitblit v1.8.0