Merge branch 'newfunc_0414_kolon_task' of...

Merge branch 'newfunc_0414_kolon_task' of https://git.wxpai.cn/piplus-v3/task-kolon into newfunc_0414_kolon_task

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

@@ -155,7 +155,6 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 				flag = true;
 			}
 			if (flag) {
-				kolonMember.updateTime = new Date();
 				this.save(kolonMember);
 				if(oldCsNo!=null){//csno被kolon覆盖
 					kolonMemberPreassignSnRepository.setStatusWithKolonReplace(oldCsNo);
@@ -316,10 +315,10 @@ public class KolonMemberServiceImpl implements KolonMemberService {
 		for(KolonMember km : kolonMembers){
 			if(km.dataSource == 2){
 				updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
-			}else if(km.dataSource == 1 && km.joinTime.before(km.updateTime)){  //加入时间在更新时间之前，数据是更新的
-				updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
-			}else{
+			}else if(km.dataSource == 1 && km.joinTime.after(lastSendDate)){  //加入时间在发送时间之后，数据是新增的
 				addData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
+			}else{
+				updateData.add(new String[] { km.csNo.toString(), km.phone, km.email, km.wechatFirstName, km.wechatLastName});
 			}
 			if(lastSendDate.before(km.updateTime)){  //获取数据较后的更新时间
 				lastSendDate = km.updateTime;