From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
index 6a93049..208aab7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoWeiQuanOrderMapper.java
@@ -25,31 +25,34 @@
TaoBaoWeiQuanOrder selectByOrderIdAndOrderItemId(@Param("orderId") String orderId,
@Param("orderItemId") String orderItemId);
+ TaoBaoWeiQuanOrder selectByOrderItemId(String orderItemId);
+
// 鎸夎鍗曞彿鍜岀淮鏉冪姸鎬佹煡璇�
List<TaoBaoWeiQuanOrder> selectListByOrderIdAndState(@Param("orderId") String orderId,
@Param("state") String state);
-
-
+
/**
* 缁熻鎬婚噾棰�
- * @param dateType
+ *
+ * @param dateType
* @param years
* @param startTime
* @param endTime
* @return
*/
- List<Map<String, Object>> countWeiQaunOrderNumber(@Param("dateType")Integer dateType, @Param("year") String year,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
-
+ List<Map<String, Object>> countWeiQaunOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
+
/**
* 缁熻鎬讳釜鏁�
- * @param dateType
+ *
+ * @param dateType
* @param years
* @param startTime
* @param endTime
* @return
*/
- List<Map<String, Object>> countWeiQaunOrderMoney(@Param("dateType")Integer dateType, @Param("year") String year,
- @Param("startTime")String startTime, @Param("endTime")String endTime);
-
+ List<Map<String, Object>> countWeiQaunOrderMoney(@Param("dateType") Integer dateType, @Param("year") String year,
+ @Param("startTime") String startTime, @Param("endTime") String endTime);
+
}
\ No newline at end of file
--
Gitblit v1.8.0