From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java |    6 ++++++
 1 files changed, 6 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..48af530 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
@@ -30,6 +30,7 @@
 				order.setUpdateTime(new Date());
 			elmeOrderMapper.insertSelective(order);
 		} else {
+			order.setId(oldOrder.getId());
 			// 鏇存柊浠樻閲戦锛岃绠楃姸鎬�
 			ElmeOrder update = new ElmeOrder();
 			update.setId(oldOrder.getId());
@@ -39,4 +40,9 @@
 			elmeOrderMapper.updateByPrimaryKeySelective(update);
 		}
 	}
+
+	@Override
+	public ElmeOrder selectByPrimaryKey(Long id) {
+		return elmeOrderMapper.selectByPrimaryKey(id);
+	}
 }

--
Gitblit v1.8.0