增加生日字段

src/main/java/com/hdp/pi/domain/kolon/KolonMember.java

@@ -92,4 +92,9 @@ public class KolonMember implements Serializable {
 	@Column(name = "update_time", nullable = true)
 	public Date updateTime;
 
+	/**
+	 * 生日
+	 */
+	@Column(name = "birthday", nullable = true)
+	public Date birthday;
 }

src/main/java/com/hdp/pi/dto/kolon/KolonMemberDTO.java

@@ -15,6 +15,8 @@ public class KolonMemberDTO implements Serializable {
 	
 	public String cardNo;
 	
+	public String birthday;
+	
 	public String phone;
 
 	public String lastName;
@@ -42,22 +44,24 @@ public class KolonMemberDTO implements Serializable {
 	public KolonMemberDTO(String[] row) {
 		super();
 		this.csNo = Util.getByIndex(row, 1);
-		this.status = CONSTANTS.STATUS.get(Util.getByIndex(row, 2));
-		String b_str = Util.getByIndex(row, 3);
+		this.birthday = Util.getByIndex(row, 2);
+		this.status = CONSTANTS.STATUS.get(Util.getByIndex(row, 3));
+		String b_str = Util.getByIndex(row, 4);
 		if(StringUtils.isNotEmpty(b_str)){
 			this.bonus = Integer.valueOf(b_str);
 		}else{
 			this.bonus = 0;
 		}
-		this.cardNo = Util.getByIndex(row, 4);
-		this.lifecycle = Util.getByIndex(row, 5);
-		this.customerType = CONSTANTS.CUSTERMERTYPE.get(Util.getByIndex(row, 6));
-		this.firstName = Util.getByIndex(row, 7);
-		this.lastName = Util.getByIndex(row, 8);
-		this.email = Util.getByIndex(row, 9);
-		this.phone = Util.getByIndex(row, 10);
+		this.cardNo = Util.getByIndex(row, 5);
+		this.lifecycle = Util.getByIndex(row, 6);
+		this.customerType = CONSTANTS.CUSTERMERTYPE.get(Util.getByIndex(row, 7));
+		this.firstName = Util.getByIndex(row, 8);
+		this.lastName = Util.getByIndex(row, 9);
+		this.email = Util.getByIndex(row, 10);
+		this.phone = Util.getByIndex(row, 11);
 		this.wechatLastName= this.lastName;
 		this.wechatFirstName= this.firstName;
+		
 	}
 
 }

src/main/java/com/hdp/pi/service/kolon/KolonMemberServiceImpl.java

@@ -90,8 +90,8 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 		String csNo = kolonMemberDTO.csNo;
 		KolonMember kolonMember = null;
 		
-		//没有phone和csNo，不处理
-		if(!StringUtils.isNotEmpty(kolonMemberDTO.phone) && !StringUtils.isNotEmpty(csNo)){
+		//没有phone和csNo、cardNo，不处理
+		if(!StringUtils.isNotEmpty(kolonMemberDTO.phone) && !StringUtils.isNotEmpty(csNo) && !StringUtils.isNotEmpty(kolonMemberDTO.cardNo)){
 			return null;
 		}
 		
@@ -111,6 +111,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 			kolonMember.lifecycle = kolonMemberDTO.lifecycle;
 			kolonMember.customerType = kolonMemberDTO.customerType;
 			kolonMember.dataSource = 2;
+			kolonMember.birthday = Util.StringToDate(kolonMemberDTO.birthday);
 			Date date = new Date();
 			kolonMember.joinTime = date;
 			kolonMember.updateTime = date;
@@ -179,6 +180,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 			String sortName = name.substring(name.lastIndexOf("/") + 1, name.length());
 			if(ftpMemberUtil.contains(sortName)){
 				List<String[]> list = ftpMemberUtil.readCSVFile(sortName);
+				LOGGER.info("正在导入" + sortName + "共" + list.size() + "条");
 				if (list != null) {
 					boolean firstRow = true;
 					int i = 1;
@@ -206,6 +208,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 						kolonMemberRepository.save(insertKolonMember);
 					}
 				}
+				LOGGER.info("导入完成");
 				ftpMemberUtil.moveFile(sortName);
 			}
 		}

src/main/java/com/hdp/pi/utils/kolon/Util.java

 package com.hdp.pi.utils.kolon;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
 
 public class Util {
 	
@@ -29,4 +34,20 @@ public class Util {
 		}
 		return row[index];
 	}
+	
+	/**
+	 * 时间转Date
+	 * @param time
+	 * @return
+	 */
+	public static Date StringToDate(String time) {
+		if(!isNotNull(time)){
+			return null;
+		}
+	    LocalDate localDate = LocalDate.parse(time);
+	    ZoneId zone = ZoneId.systemDefault();
+	    Instant instant = localDate.atStartOfDay().atZone(zone).toInstant();
+	    java.util.Date date = Date.from(instant);
+	    return date;
+	}
 }