From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 940ee39..66b56ac 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
@@ -16,6 +16,7 @@
 
 import com.yeshi.fanli.dao.mybatis.homemodule.FloatADMapper;
 import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
+import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.exception.homemodule.FloatADException;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -52,6 +53,10 @@
 			throw new FloatADException(1, "璺宠浆鍙傛暟闈濲SON鏍煎紡");
 		}
 		
+		FloatADTypeEnum typeEnum = record.getTypeEnum();
+		if (typeEnum == null)
+			throw new FloatADException(1, "绫诲瀷涓嶈兘涓虹┖");
+			
 		if (!StringUtil.isNullOrEmpty(jumpType)) {
 			List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
 			if (listByType !=null && listByType.size() > 0) {
@@ -221,6 +226,11 @@
 		
 		for (FloatAD floatAD : listQuery) {
 			
+			FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
+			if (typeEnum != null) {
+				floatAD.setTypeName(typeEnum.getDesc());
+			}
+			
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
 			Date startTime = floatAD.getStartTime();
 			if (startTime == null) {
@@ -283,5 +293,15 @@
 		return floatAD;
 	}
 	
+	
+	@Override
+	public List<FloatAD> getValidCommonByPosition(String position) {
+		return floatADMapper.getValidFloatAD(position, 1);
+	}
+	
+	@Override
+	public List<FloatAD> getValidByPosition(String position) {
+		return floatADMapper.getValidFloatAD(position, null);
+	}
 }
 

--
Gitblit v1.8.0