From 71887083f013032c70741389b2842be2f4022023 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 15:30:43 +0800
Subject: [PATCH] 加入是否新人弹框  + 淘礼金帮助链接调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
index e2fe975..4f2dcf2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java
@@ -84,6 +84,12 @@
 			picture = uploadPicture(file);
 		}
 		
+		// 閫傜敤绫诲瀷 锛� 0閫氱敤  1鏂颁汉
+		Integer type = record.getType();
+		if (type == null) {
+			record.setType(0);
+		}
+		
 		Long id = record.getId();
 		if (id == null) {
 			int maxOrder = floatADMapper.getMaxOrderByPosition(position);
@@ -93,10 +99,6 @@
 				record.setState(0);
 			}
 			
-			Integer type = record.getType();
-			if (type == null) {
-				record.setType(0);
-			}
 			record.setOrder(maxOrder + 1);
 			record.setCreateTime(new Date());
 			record.setUpdateTime(new Date());
@@ -117,7 +119,6 @@
 				record.setPicture(resultObj.getPicture());
 			}
 			
-			record.setType(resultObj.getType());
 			record.setOrder(resultObj.getOrder());
 			record.setCreateTime(resultObj.getCreateTime());
 			record.setUpdateTime(new Date());

--
Gitblit v1.8.0