From bbe1a381f99d957d003f48b68dfd5bf0e401f5f0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:27:25 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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 db78787..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
@@ -181,10 +181,42 @@
/**
* 鏍规嵁鏉ユ簮绫诲瀷涓庤鍗曞彿鏌ヨ鍒楄〃
+ *
* @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