From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期三, 27 三月 2019 12:17:33 +0800 Subject: [PATCH] 主分类 + 子分类 DAO改造 --- fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 103 insertions(+), 9 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 27ad1db..147f4d2 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 @@ -22,10 +22,10 @@ * @return */ - 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); + 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); /** * 缁熻鐢ㄦ埛璁㈠崟 骞惰鍗曞彿鍒嗙粍 @@ -39,6 +39,14 @@ @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锛岃鍗曠姸鎬佸拰璁㈠崟缁撶畻鏃堕棿缁熻璁㈠崟鐨勬暟閲� @@ -49,7 +57,8 @@ * @param maxDate * @return */ - long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid")Long uid, @Param("state")int state,@Param("minDate") Date minDate,@Param("maxDate") Date maxDate); + long countByUidAndOrderStateWithOrderBalanceTime(@Param("uid") Long uid, @Param("state") int state, + @Param("minDate") Date minDate, @Param("maxDate") Date maxDate); /** * 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝� @@ -75,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); /** @@ -95,11 +103,17 @@ */ 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); - /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟鎺掑簭鍊艰幏鍙栬鎯� @@ -115,4 +129,84 @@ 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); + } \ No newline at end of file -- Gitblit v1.8.0