修改csno为string

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

@@ -24,7 +24,7 @@ public class KolonMember implements Serializable {
 	public Long id;
 
 	@Column(name = "cs_no", nullable = false)
-	public Long csNo;
+	public String csNo;
 
 	@Column(name = "card_no", nullable = true)
 	public String cardNo;

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

@@ -11,7 +11,7 @@ public class KolonMemberDTO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	public Long csNo;
+	public String csNo;
 	
 	public String cardNo;
 	
@@ -41,7 +41,7 @@ public class KolonMemberDTO implements Serializable {
 	
 	public KolonMemberDTO(String[] row) {
 		super();
-		this.csNo = Long.valueOf(Util.getByIndex(row, 1));
+		this.csNo = Util.getByIndex(row, 1);
 		this.status = CONSTANTS.STATUS.get(Util.getByIndex(row, 2));
 		String b_str = Util.getByIndex(row, 3);
 		if(StringUtils.isNotEmpty(b_str)){

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

@@ -17,5 +17,5 @@ public interface KolonMemberPreassignSnRepository extends JpaRepository<KolonMem
 
 	@Modifying
 	@Query("update KolonMemberPreassignSn SET useStatus=2,updateTime = SYSDATE() where csNo=:csNo")
-	public void setStatusWithKolonReplace(@Param("csNo") Long csNo);
+	public void setStatusWithKolonReplace(@Param("csNo") String csNo);
 }

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

@@ -19,7 +19,7 @@ import com.hdp.pi.domain.kolon.KolonMember;
 @Repository
 public interface KolonMemberRepository extends JpaRepository<KolonMember, Long>, JpaSpecificationExecutor<KolonMember> {
 
-	KolonMember findFirstByCsNo(Long csNo);
+	KolonMember findFirstByCsNo(String csNo);
 	
 	KolonMember findFirstByPhone(String phone);
 	

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

@@ -8,7 +8,7 @@ import com.hdp.pi.domain.kolon.KolonMember;
 
 public interface KolonMemberService {
 
-	KolonMember findOneByCsNo(Long csNo);
+	KolonMember findOneByCsNo(String csNo);
 	
 	void save(KolonMember kolonMember);
 	

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

@@ -58,7 +58,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 	private SaleRepository saleRepository;
 	
 	@Override
-	public KolonMember findOneByCsNo(Long csNo) {
+	public KolonMember findOneByCsNo(String csNo) {
 		return kolonMemberRepository.findFirstByCsNo(csNo);
 	}
 
@@ -84,7 +84,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public void matchData(String[] s) {
 		KolonMemberDTO kolonMemberDTO = new KolonMemberDTO(s);
-		Long csNo = kolonMemberDTO.csNo;
+		String csNo = kolonMemberDTO.csNo;
 		KolonMember kolonMember = null;
 		if(StringUtils.isNotEmpty(kolonMemberDTO.phone)){
 			kolonMember = kolonMemberRepository.findFirstByPhone(kolonMemberDTO.phone);
@@ -110,7 +110,7 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 			this.save(kolonMember);
 		} else { // 更新
 			boolean flag = false;
-			Long oldCsNo = null;//是否更新了csno
+			String oldCsNo = null;//是否更新了csno
 			if(!kolonMemberDTO.csNo.equals(kolonMember.csNo)){//kolon和派加都注册了，以kolon为准
 				oldCsNo = kolonMember.csNo;
 				kolonMember.csNo = kolonMemberDTO.csNo;