From b7a90c576ac6b482c68ad6d0c2777831f9127b4a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   15 +++++++++++++++
 1 files changed, 15 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..f831d48 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,19 @@
 	 */
 	public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid);
 
+	
+	/**
+	 * 缁熻璁㈠崟璁板綍鏁伴噺-闈炶鍗曞彿涓轰富
+	 * @param uid
+	 * @param payment
+	 * @return
+	 */
+	public long countOrderByUidAndSettled(Long uid, BigDecimal payment);
+
+	/**
+	 * 鑾峰彇鏈�鏂扮殑娣樺疂璁㈠崟鍙�
+	 * @return
+	 */
+	public String getNewestOrderNoByTaoBao();
+
 }

--
Gitblit v1.8.0