From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
index fcdaf4d..f284fe1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.lable;
 
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -353,5 +354,40 @@
 		return labelMapper.getByGoodsId(goodsId);
 	}
 	
+	@Override
+	public List<Label> addBatchByNames(String lableNames, AdminUser admin) throws LabelException{
+		if (lableNames == null || lableNames.trim().length() == 0) {
+			return null;
+		}
+
+		List<Label> listLabs = new ArrayList<Label>();
+		// 绌烘牸闅斿紑
+		String[] arrtitles = lableNames.split("\\s+");
+		
+		for (String title : arrtitles) {
+			/* 閬嶅巻鏍囩鍚嶇О锛氭煡璇㈡暟鎹簱涓槸鍚﹀凡瀛樺湪 */
+			List<Label> labels = labelService.selectByTitle(title.trim());
+			if (labels != null && labels.size() > 0) {
+				Label label = labels.get(0);
+				listLabs.add(label);
+			} else {
+				// 鏂板
+				Label label = new Label();
+				label.setTitle(title);// 鍚嶇О
+				label.setEntrymode(Label.MODE_SYSTEM); // 鎵归噺褰曞叆
+				label.setCreatetime(new Date());
+				label.setUpdatetime(new Date());
+				label.setCreateUser(admin);
+				label.setIosClick(0l);
+				label.setAndroidClick(0l);
+				labelService.insertSelective(label);
+				
+				listLabs.add(label);
+			}
+		}
+		
+		return listLabs;
+	}
+	
 }
 

--
Gitblit v1.8.0