From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderGoodsMapper.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderGoodsMapper.java
index d3db2af..6f5faa4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderGoodsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderGoodsMapper.java
@@ -2,17 +2,40 @@
import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
-public interface CommonOrderGoodsMapper extends BaseMapper<CommonOrderGoods>{
-
+public interface CommonOrderGoodsMapper extends BaseMapper<CommonOrderGoods> {
+
/**
* 鏍规嵁璁㈠崟鍙枫�佽鍗曠被鍨嬫煡璇㈠晢鍝�
- * @param list 璁㈠崟瀵硅薄
+ *
+ * @param list
+ * 璁㈠崟瀵硅薄
* @return
*/
List<CommonOrderGoods> listByOrderNoAndType(List<CommonOrder> list);
-
+
+ /**
+ * 鏍规嵁鍟嗗搧ID涓庡晢鍝佺被鍨嬫煡璇㈠晢鍝�
+ *
+ * @param goodsId
+ * @param goodsType
+ * @return
+ */
+ List<CommonOrderGoods> listByGoodsIdAndGoodsType(@Param("goodsId") String goodsId,
+ @Param("goodsType") int goodsType);
+
+ /**
+ * 娌℃湁鏍囬鐨勫垪琛�
+ *
+ * @param start
+ * @param count
+ * @return
+ */
+ List<CommonOrderGoods> listNoTitle(@Param("start") long start, @Param("count") int count);
+
}
\ No newline at end of file
--
Gitblit v1.8.0