From 8870f82f07541e27dc6b94b310070625ff9cc6ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 十一月 2019 15:18:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 ad2a954..21967bf 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
@@ -85,9 +85,9 @@
* @param uid
* @return
*/
- Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
+ long countUserOrderToApp(@Param("uid") Long uid, @Param("type") Integer type,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
- @Param("source") Integer source);
+ @Param("source") Integer source,@Param("state") Integer state, @Param("stateOrder") Integer stateOrder);
/**
* 濂栭噾璁㈠崟鏁伴噺
@@ -174,7 +174,9 @@
List<CommonOrderVO> listQuery(@Param("start") long start, @Param("count") int count,
@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source);
+ @Param("endTime") String endTime, @Param("source") Integer source,
+ @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money);
/**
* 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
@@ -201,7 +203,9 @@
*/
long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source);
+ @Param("endTime") String endTime, @Param("source") Integer source,
+ @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money);
long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
@@ -256,17 +260,16 @@
* @return
*/
List<CommonOrder> listBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
-
-
+
/**
* 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟鍒楄〃
+ *
* @param sourceType
* @param tradeIdList
* @return
*/
- List<CommonOrder> listBySourceTypeAndTradeIdList(@Param("sourceType") int sourceType, @Param("tradeIdList") List<String> tradeIdList);
-
-
+ List<CommonOrder> listBySourceTypeAndTradeIdList(@Param("sourceType") int sourceType,
+ @Param("tradeIdList") List<String> tradeIdList);
/**
*
@@ -281,13 +284,35 @@
List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
@Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
@Param("start") long start, @Param("count") int count);
-
-
+
/**
* 鏍规嵁璁㈠崟鍙锋煡璇�
+ *
* @param orderNO
* @return
*/
List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ
+ * @param uid
+ * @param stateList
+ * @param start
+ * @param count
+ * @return
+ */
+ List<CommonOrder> listByUid(@Param("uid")Long uid,@Param("stateList") List<Integer> stateList,@Param("start") long start,@Param("count") int count);
+
+
+ /**
+ * 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
+ * @param uid
+ * @param typeHB 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�
+ * @param typeDate 鏃ユ湡绫诲瀷锛� 3鏈湀 4涓婃湀
+ * @return
+ */
+ CommonOrderVO firstValidOrderByUid(@Param("uid") Long uid, @Param("typeHB") Integer typeHB,
+ @Param("typeDate") Integer typeDate);
+
}
\ No newline at end of file
--
Gitblit v1.8.0