From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
index 54f87f7..4f1db51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderMapper.java
@@ -1,35 +1,41 @@
-package com.yeshi.fanli.dao.mybatis.order;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.bus.user.Order;
-
-public interface OrderMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(Order record);
-
- int insertSelective(Order record);
-
- Order selectByPrimaryKey(Long id);
-
- // 鏍规嵁璁㈠崟鍙锋煡鎵捐鍗�
- Order selectOrderByOrderId(String orderId);
-
- /**
- * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟绫诲瀷鏌ユ壘璁㈠崟
- * @param orderId
- * @param orderType
- * @return
- */
- List<Order> selectOrderByOrderIdAndOrderType(@Param("orderId")String orderId,@Param("orderType") int orderType);
-
- List<Order> selectByUid(Long uid);
-
- int updateByPrimaryKeySelective(Order record);
-
- int updateByPrimaryKey(Order record);
+package com.yeshi.fanli.dao.mybatis.order;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.user.Order;
+
+public interface OrderMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(Order record);
+
+ int insertSelective(Order record);
+
+ Order selectByPrimaryKey(Long id);
+
+ /**
+ * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟绫诲瀷鏌ユ壘璁㈠崟
+ *
+ * @param orderId
+ * @param orderType
+ * @return
+ */
+ Order selectOrderByOrderIdAndOrderType(@Param("orderId") String orderId, @Param("orderType") int orderType);
+
+ List<Order> selectByUid(Long uid);
+
+ int updateByPrimaryKeySelective(Order record);
+
+ int updateByPrimaryKey(Order record);
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID璁㈠崟绫诲瀷鍜屽娉ㄦ煡璇㈠垪琛�
+ *
+ * @return
+ */
+ List<Order> listByUidAndOrderTypeAndBeiZhu(@Param("uid") Long uid, @Param("orderType") int orderType,
+ @Param("beiZhu") String beiZhu);
}
\ No newline at end of file
--
Gitblit v1.8.0