From 6b8ab82d1d7fb9d44d85eeb1dfd2e36d3c28c9cf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 六月 2019 11:30:21 +0800
Subject: [PATCH] 客服消息修改，新版大淘客数据添加
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 144 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 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 9151e85..93fd2a6 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.dao.mybatis.order;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -21,10 +22,10 @@
* @return
*/
- List<CommonOrderVO> listGroupOrderNoByUid(@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);
+ 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);
/**
* 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍
@@ -34,9 +35,30 @@
* @param uid
* @return
*/
- long countGroupOrderNoByUid(@Param("uid") Long uid, @Param("state") Integer state, @Param("type") Integer type,
+ 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 uid
+ * @param orderNo
+ * @return
+ */
+ CommonOrderVO getBuFenOrderState(@Param("uid") Long uid, @Param("orderNo") String orderNo);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲�
+ *
+ * @param uid
+ * @param state
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid") Long uid, @Param("state") int state,
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
@@ -45,15 +67,15 @@
* 璁㈠崟瀵硅薄
* @return
*/
- List<CommonOrderVO> listByOrderNoAndType(List<CommonOrderVO> list);
+ List<CommonOrderVO> listOrderGoodsInfo(List<CommonOrderVO> list);
/**
- * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
+ * 缁熻鍘嗗彶璁㈠崟鏁伴噺
*
* @param uid
* @return
*/
- Map<String, BigDecimal> countOrderByHongBaoType(@Param("uid") Long uid, @Param("day") Integer day);
+ Map<String, BigDecimal> countHistoryOrder(@Param("uid") Long uid, @Param("day") Integer day);
/**
* 鏄ㄦ棩鎬昏鍗�-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -62,7 +84,6 @@
* @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);
/**
@@ -71,7 +92,8 @@
* @param uid
* @return
*/
- long countBonusOrder(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
+ long countBonusOrderNumber(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
* 濂栭噾缁熻
@@ -79,7 +101,17 @@
* @param uid
* @return
*/
- BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
+ BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ /**
+ * 濂栭噾缁熻
+ *
+ * @param uid
+ * @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);
int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);
@@ -97,4 +129,94 @@
CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
@Param("orderType") int orderType, @Param("orderBy") int orderBy);
+ /**
+ * 璁㈠崟鍒楄〃鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ List<CommonOrderVO> listQueryByUid(@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);
+
+ /**
+ * 缁熻
+ */
+ long countQueryByUid(@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 start
+ * @param count
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ 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);
+
+ /**
+ * 缁熻
+ */
+ 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 sourceType
+ * @param orderNo
+ * @return
+ */
+ List<CommonOrder> listBySourceTypeAndOrderNo(@Param("sourceType") int sourceType, @Param("orderNo") String orderNo);
+
+ /**
+ * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+ *
+ * @param uid
+ * @param state
+ * @param orderNo
+ * @return
+ */
+ List<CommonOrderVO> getCouponHongbaoByOrderNo(@Param("uid") Long uid, @Param("hongBaoState") Integer hongBaoState,
+ @Param("orderNo") String orderNo);
+
+ /**
+ * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+ *
+ * @param uid
+ * @param state
+ * @param orderNo
+ * @return
+ */
+ CommonOrderVO getCommonOrderByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo,
+ @Param("orderState") Integer orderState);
+
+ /**
+ * 鏍规嵁鏉ユ簮鍜屼氦鏄揑D鑾峰彇璁㈠崟璇︽儏
+ * @param sourceType
+ * @param tradeId
+ * @return
+ */
+
+ CommonOrder selectBySourceTypeAndTradeId(@Param("sourceType") int sourceType, @Param("tradeId") String tradeId);
+
}
\ No newline at end of file
--
Gitblit v1.8.0