From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 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 47518db..655c4e9 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
@@ -369,5 +369,58 @@
* @return
*/
long countSearchOrderByUid(@Param("uid") Long uid, @Param("list")List<ESOrder> list);
+
+
+
+ /**
+ * 鏌ヨ鏈�灏忕粨绠楁椂闂�
+ * @return
+ */
+ List<CommonOrder> getMinSettleTimeAndUid();
+
+
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ List<CommonOrderVO> getOrderList(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+ @Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
+ @Param("orderNo") String orderNo, @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("day") Integer day, @Param("listSource") List<Integer> listSource);
+
+ /**
+ * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ long countOrderList(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
+ @Param("orderState") Integer orderState, @Param("orderNo") String orderNo,
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+ @Param("listSource") List<Integer> listSource);
+
+
+ /**
+ * 缁熻宸茬粨绠椾笖浠樻閲戦澶т簬1鐨勮鍗曪紙涓嶅尯鍒嗚鍗曠姸鎬侊級
+ * @param uid
+ * @param payment
+ * @return
+ */
+ Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
+
+ /**
+ * 鑾峰彇鏈�鏂扮殑娣樺疂璁㈠崟鍙�
+ * @return
+ */
+ String getNewestOrderNoByTaoBao();
+
}
\ No newline at end of file
--
Gitblit v1.8.0