From d2f0048ff3d2e927ab0629fffe3e40ba91c11976 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 16:53:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 31e4a70..21c6a49 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -409,4 +409,12 @@
 			@Param("listSource") List<Integer> listSource);
 	
 
+	/**
+	 * 缁熻宸茬粨绠椾笖浠樻閲戦澶т簬1鐨勮鍗曪紙涓嶅尯鍒嗚鍗曠姸鎬侊級
+	 * @param uid
+	 * @param payment
+	 * @return
+	 */
+	Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0