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/service/impl/order/jd/JDOrderServiceImpl.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java
index 96300bb..561bef7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/jd/JDOrderServiceImpl.java
@@ -22,7 +22,7 @@
 	@Resource
 	private JDOrderMapper jdOrderMapper;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void addJDOrder(JDOrder order) throws JDOrderException {
 		if (order == null)
@@ -76,4 +76,23 @@
 		return order;
 	}
 
+	@Override
+	public Long countOrderByDay(String preDay) {
+		return jdOrderItemMapper.countOrderByDay(preDay);
+	}
+	
+	
+	@Override
+	public List<JDOrderItem> listQuery(long start, int count, String key) {
+		return jdOrderItemMapper.listQuery(start, count, key);
+	}
+	
+	@Override
+	public long countQuery(String key) {
+		 Long count = jdOrderItemMapper.countQuery(key);
+		 if (count == null) {
+			 count = 0L;
+		 }
+		 return count;
+	}
 }

--
Gitblit v1.8.0