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 | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 216 insertions(+), 12 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 93fd2a6..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
@@ -9,7 +9,9 @@
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
@@ -25,7 +27,7 @@
List<CommonOrderVO> listUserOrder(@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("day") Integer day, @Param("listSource") List<Integer> listSource);
/**
* 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -37,7 +39,8 @@
*/
long countUserOrder(@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("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day,
+ @Param("listSource") List<Integer> listSource);
/**
* 鍒ゆ柇閮ㄥ垎澶辨晥鐘舵��
@@ -75,16 +78,26 @@
* @param uid
* @return
*/
- Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day);
+ Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day,
+ @Param("source") Integer source);
+
+ /**
+ * 缁熻鏈夋晥璁㈠崟鏁伴噺
+ * @param uid
+ * @return
+ */
+ OrderCountVO getOrderCount(@Param("uid") Long uid, @Param("day")Integer day, @Param("listSource") List<Integer> listSource);
+
/**
* 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
*
* @param uid
* @return
*/
- Map<String, BigDecimal> countByUidAndOrderState(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("day") Integer day);
+ 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("state") Integer state, @Param("stateOrder") Integer stateOrder);
/**
* 濂栭噾璁㈠崟鏁伴噺
@@ -93,7 +106,7 @@
* @return
*/
long countBonusOrderNumber(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
/**
* 濂栭噾缁熻
@@ -102,7 +115,7 @@
* @return
*/
BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source);
/**
* 濂栭噾缁熻
@@ -111,7 +124,8 @@
* @return
*/
Map<String, Object> countBonusOrderMoneyAndNumber(@Param("uid") Long uid, @Param("type") Integer type,
- @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("day") Integer day, @Param("startTime") String startTime, @Param("endTime") String endTime,
+ @Param("source") Integer source);
int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
@@ -170,14 +184,42 @@
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("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, @Param("payment") BigDecimal payment);
+
+ /**
+ * 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
+ *
+ * @param start
+ * @param count
+ * @param keyType
+ * @param key
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @param source
+ * @return
+ */
+ List<CommonOrderVO> listQueryWithNoChild(@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("payment") BigDecimal payment);
/**
* 缁熻
*/
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("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,@Param("payment") BigDecimal payment);
+
+ long countQueryWithNoChild(@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("payment") BigDecimal payment);
/**
* 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
@@ -208,15 +250,177 @@
* @return
*/
CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo,
- @Param("orderState") Integer orderState);
+ @Param("orderState") Integer orderState, @Param("sourceType") Integer sourceType);
/**
* 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟璇︽儏
+ *
* @param sourceType
* @param tradeId
* @return
*/
-
+
CommonOrder selectBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+ /**
+ * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟鍒楄〃
+ *
+ * @param sourceType
+ * @param tradeId
+ * @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);
+
+ /**
+ *
+ * @param sourceType
+ * @param state
+ * @param minTime
+ * -鏈�澶у垱寤烘椂闂�
+ * @param maxTime
+ * -鏈�灏忓垱寤烘椂闂�
+ * @return
+ */
+ 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);
+
+
+ /**
+ * 鑾峰彇棣栫瑪鍒嗕韩璁㈠崟锛�
+ * @param uid
+ * @return
+ */
+ CommonOrder getFirstShareOrderByUid(@Param("uid") Long uid);
+
+ /**
+ * 缁熻璁㈠崟鍙峰埌璐﹂噾棰�
+ * @param uid
+ * @return
+ */
+ BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(@Param("orderNo") String orderNo, @Param("sourceType") Integer sourceType);
+
+ /**
+ * 缁熻24灏忔椂鏈夋晥鑷喘璁㈠崟
+ * @param uid
+ * @return
+ */
+ long count24HValidOrderByUid(@Param("uid") Long uid, @Param("minTime") Date minTime);
+
+
+ /**
+ * 鎼滅储璁㈠崟
+ * @param start
+ * @param count
+ * @param uid
+ * @param list
+ * @return
+ */
+ List<CommonOrderVO> searchOrderByUid(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+ @Param("list")List<ESOrder> list);
+
+
+ /**
+ * 鎼滅储璁㈠崟
+ * @param start
+ * @param count
+ * @param uid
+ * @param list
+ * @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