From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 d38221e..624e1bd 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);
/**
* 濂栭噾璁㈠崟鏁伴噺
@@ -300,4 +300,14 @@
*/
List<CommonOrder> listByUid(@Param("uid")Long uid,@Param("stateList") List<Integer> stateList,@Param("start") long start,@Param("count") int count);
+
+ /**
+ * 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
+ * @param uid
+ * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�
+ * @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