更新member status

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

@@ -138,6 +138,22 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 				kolonMember.lastName = kolonMemberDTO.lastName;
 				flag = true;
 			}
+			if (!Util.isNotNull(kolonMemberDTO.status)) {
+				kolonMember.status = kolonMemberDTO.status;
+				flag = true;
+			}
+			if (!Util.isNotNull(kolonMemberDTO.bonus)) {
+				kolonMember.bonus = kolonMemberDTO.bonus;
+				flag = true;
+			}
+			if (!Util.isNotNull(kolonMemberDTO.lifecycle)) {
+				kolonMember.lifecycle = kolonMemberDTO.lifecycle;
+				flag = true;
+			}
+			if (!Util.isNotNull(kolonMemberDTO.customerType)) {
+				kolonMember.customerType = kolonMemberDTO.customerType;
+				flag = true;
+			}
 			if (flag) {
 				kolonMember.updateTime = new Date();
 				this.save(kolonMember);

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

@@ -110,6 +110,12 @@ public class FtpMemberUtil {
 				throw new RuntimeException("FTP server refused connection.");
 			}
 		} catch (Throwable e) {
+			if(ftpClient!=null){
+				try {
+					ftpClient.disconnect();
+				} catch (IOException e2) {
+				}
+			}
 			throw new RuntimeException(e);
 		}
 		return ftpClient;
@@ -161,7 +167,7 @@ public class FtpMemberUtil {
 			String name = fileName
 					.substring(0, fileName.lastIndexOf("."));
 			String newFileName = name + "_" + getTime() + suffix;
-
+			ftpClient.mkd(getFileHistoryDir);
 			ftpClient.rename(getFileDir + fileName, getFileHistoryDir
 					+ newFileName);
 		} catch (Throwable e) {
@@ -205,9 +211,10 @@ public class FtpMemberUtil {
 	 * 上传文件到FTP服务器
 	 */
 	public void uploadFile() {
+		FTPClient ftpClient = null;
 		try {
 			SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd");
-			FTPClient ftpClient = this.getFTPClient();
+			ftpClient = this.getFTPClient();
 			ftpClient.mkd(putFileDir);
 			ftpClient.changeWorkingDirectory(putFileDir);
 			InputStream addInputStream = new FileInputStream(new File(
@@ -219,6 +226,14 @@ public class FtpMemberUtil {
 			ftpClient.storeFile(putUpdateFileName.replace("YYYY-MM-dd",sdf.format(new Date())), updateInputStream);
 		} catch (Throwable e) {
 			throw new RuntimeException(e);
+		}finally{
+			if(ftpClient!=null){
+				try {
+					ftpClient.disconnect();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
 		}
 	}
 

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

@@ -70,6 +70,12 @@ public class FtpProductUtil {
 				throw new RuntimeException("FTP server refused connection.");
 			}
 		} catch (Throwable e) {
+			if(ftpClient!=null){
+				try {
+					ftpClient.disconnect();
+				} catch (IOException e2) {
+				}
+			}
 			throw new RuntimeException(e);
 		}
 		return ftpClient;
@@ -122,7 +128,7 @@ public class FtpProductUtil {
 			String name = fileName
 					.substring(0, fileName.lastIndexOf("."));
 			String newFileName = name + "_" + getTime() + suffix;
-
+			ftpClient.mkd(getFileHistoryDir);
 			ftpClient.rename(getFileDir + fileName, getFileHistoryDir
 					+ newFileName);
 		} catch (Throwable e) {

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

@@ -70,6 +70,12 @@ public class FtpSaleUtil {
 				throw new RuntimeException("FTP server refused connection.");
 			}
 		} catch (Throwable e) {
+			if(ftpClient!=null){
+				try {
+					ftpClient.disconnect();
+				} catch (IOException e2) {
+				}
+			}
 			throw new RuntimeException(e);
 		}
 		return ftpClient;
@@ -122,7 +128,7 @@ public class FtpSaleUtil {
 			String name = fileName
 					.substring(0, fileName.lastIndexOf("."));
 			String newFileName = name + "_" + getTime() + suffix;
-
+			ftpClient.mkd(getFileHistoryDir);
 			ftpClient.rename(getFileDir + fileName, getFileHistoryDir
 					+ newFileName);
 		} catch (Throwable e) {