From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
index 1694387..6287f75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
@@ -22,6 +22,8 @@
// 閫氳繃浜ゆ槗ID鑾峰彇璁㈠崟
TaoBaoOrder selectTaoBaoOrderByTradeId(String tradeId);
+
+ List<TaoBaoOrder> listByTradeId(String tradeId);
int updateByPrimaryKeySelective(TaoBaoOrder record);
@@ -74,5 +76,12 @@
List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime")String startTime, @Param("endTime")String endTime);
-
+
+ /**
+ * 鑾峰彇闀挎湡鏈洿鏂扮殑璁㈠崟
+ * @param start
+ * @param count
+ * @return
+ */
+ List<TaoBaoOrder> listLongTimeNoUpdateOrders(@Param("start")long start,@Param("count")int count);
}
\ No newline at end of file
--
Gitblit v1.8.0