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/ShareGoodsActivityOrderMapper.java | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
index 745cdfa..0ec082a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java
@@ -1,28 +1,36 @@
-package com.yeshi.fanli.dao.mybatis.order;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
-
-public interface ShareGoodsActivityOrderMapper extends BaseMapper<ShareGoodsActivityOrder> {
-
- /**
- * 璁＄畻鍒嗕韩娲诲姩鐨勮鍗曟暟
- *
- * @param uid
- * @return
- */
- long countShareGoodsActivityOrderByUid(Long uid);
-
- /**
- * 鏌ヨ鍒嗕韩娲诲姩锛堟牴鎹鍗曞彿涓庣敤鎴稩D锛�
- *
- * @param uid
- * @param orderId
- * @return
- */
- List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") Long orderId);
+package com.yeshi.fanli.dao.mybatis.order;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
+
+public interface ShareGoodsActivityOrderMapper extends BaseMapper<ShareGoodsActivityOrder> {
+
+ /**
+ * 璁＄畻鍒嗕韩娲诲姩鐨勮鍗曟暟
+ *
+ * @param uid
+ * @return
+ */
+ long countShareGoodsActivityOrderByUid(Long uid);
+
+ /**
+ * 鏌ヨ鍒嗕韩娲诲姩锛堟牴鎹鍗曞彿涓庣敤鎴稩D锛�
+ *
+ * @param uid
+ * @param orderId
+ * @return
+ */
+ List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") String orderId);
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛鏌ヨ
+ * @param uid
+ * @return
+ */
+ List<ShareGoodsActivityOrder> listByUid(@Param("uid") Long uid);
}
\ No newline at end of file
--
Gitblit v1.8.0