From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java
index f46fe6e..3f7622b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.elme;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -30,6 +31,7 @@
 				order.setUpdateTime(new Date());
 			elmeOrderMapper.insertSelective(order);
 		} else {
+			order.setId(oldOrder.getId());
 			// 鏇存柊浠樻閲戦锛岃绠楃姸鎬�
 			ElmeOrder update = new ElmeOrder();
 			update.setId(oldOrder.getId());
@@ -39,4 +41,19 @@
 			elmeOrderMapper.updateByPrimaryKeySelective(update);
 		}
 	}
+
+	@Override
+	public ElmeOrder selectByPrimaryKey(Long id) {
+		return elmeOrderMapper.selectByPrimaryKey(id);
+	}
+	
+	@Override
+	public List<ElmeOrder> query(long start, int count, String key) {
+		return elmeOrderMapper.query(start, count, key);
+	}
+	
+	@Override
+	public long count(String key) {
+		return elmeOrderMapper.count(key);
+	}
 }

--
Gitblit v1.8.0