修改scrm同步到到Emarsys的csv的文件名

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

@@ -50,8 +50,8 @@ public class KolonMemberDTO implements Serializable {
 		this.cardNo = Util.getByIndex(row, 4);
 		this.lifecycle = Util.getByIndex(row, 5);
 		this.customerType = CONSTANTS.CUSTERMERTYPE.get(Util.getByIndex(row, 6));
-		this.lastName = Util.getByIndex(row, 7);
-		this.firstName = Util.getByIndex(row, 8);
+		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.wechatLastName= this.lastName;

src/main/java/com/hdp/pi/repository/kolon/KolonMemberPreassignSnRepository.java

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.hdp.pi.domain.kolon.KolonMemberPreassignSn;
 
@@ -16,6 +17,7 @@ import com.hdp.pi.domain.kolon.KolonMemberPreassignSn;
 public interface KolonMemberPreassignSnRepository extends JpaRepository<KolonMemberPreassignSn, Long>, JpaSpecificationExecutor<KolonMemberPreassignSn> {
 
 	@Modifying
+	@Transactional
 	@Query("update KolonMemberPreassignSn SET useStatus=2,updateTime = SYSDATE() where csNo=:csNo")
 	public void setStatusWithKolonReplace(@Param("csNo") String csNo);
 }

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

@@ -95,6 +95,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 		if (kolonMember == null) { // 插入数据
 			kolonMember = new KolonMember();
 			kolonMember.csNo = csNo;
+			kolonMember.cardNo = kolonMemberDTO.cardNo;
 			kolonMember.phone = kolonMemberDTO.phone;
 			kolonMember.lastName = kolonMemberDTO.lastName;
 			kolonMember.firstName = kolonMemberDTO.firstName;

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

@@ -8,9 +8,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.SocketException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.net.ftp.FTP;
@@ -205,6 +207,7 @@ public class FtpUtil {
 	 */
 	public void uploadFile() {
 		try {
+			SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd");
 			FTPClient ftpClient = this.getFTPClient();
 			ftpClient.mkd(putFileDir);
 			ftpClient.changeWorkingDirectory(putFileDir);
@@ -213,8 +216,8 @@ public class FtpUtil {
 			InputStream updateInputStream = new FileInputStream(new File(
 					tempUpdateFileName));
 
-			ftpClient.storeFile(putAddFileName, addInputStream);
-			ftpClient.storeFile(putUpdateFileName, updateInputStream);
+			ftpClient.storeFile(putAddFileName.replace("YYYY-MM-dd",sdf.format(new Date())), addInputStream);
+			ftpClient.storeFile(putUpdateFileName.replace("YYYY-MM-dd",sdf.format(new Date())), updateInputStream);
 		} catch (Throwable e) {
 			e.printStackTrace();
 			logger.error(e.toString());

src/main/resources/kolon.properties

@@ -40,8 +40,8 @@ kolon.property.ftp.tempAddFileName = /temp/tempAddContact.csv
 kolon.property.ftp.tempUpdateFileName = /temp/tempUpdateContact.csv
 
 kolon.property.ftp.putFileDir = /SCRM/
-kolon.property.ftp.putAddFileName = newContact.csv
-kolon.property.ftp.putUpdateFileName = updateContact.csv
+kolon.property.ftp.putAddFileName = newContact_YYYY-MM-dd.csv
+kolon.property.ftp.putUpdateFileName = updateContact_YYYY-MM-dd.csv