anderx месяцев назад: 3
Родитель
Сommit
885e84fb6d

Разница между файлами не показана из-за своего большого размера
+ 37 - 135
src/main/java/com/goafanti/common/mapper/UserMapper.xml


+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserTransferLogMapper.xml

@@ -167,7 +167,7 @@
   </update>
   <select id="selectByUidGetList" resultType="com.goafanti.customer.bo.transferListBo">
 	select a.id,a.type,b.nickname userName,c.name usedAName,d.name newAName,e.bname Pname,
-	       a.aid,a.uid,a.take_aid takeAid,
+	       a.aid,a.uid,a.take_aid takeAid,a.create_time as createTime,
   	date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createDate,remarks
   	from user_transfer_log a left join user b on a.uid=b.id
 	left join admin c on a.aid=c.id left join admin d on a.take_aid=d.id

+ 11 - 1
src/main/java/com/goafanti/customer/bo/transferListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.customer.bo;
 
+import java.util.Date;
+
 public class transferListBo {
 	private Integer id;
 	private Integer type;
@@ -9,11 +11,19 @@ public class transferListBo {
 	private String pName;
 	private String createDate;
 	private String remarks;
-
+	private Date createTime;
 	private String aid;
 	private String uid;
 	private String takeAid;
 
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
 	public String getAid() {
 		return aid;
 	}

+ 32 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1340,6 +1340,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			}
 			user.setInformationMaintainer(TokenManager.getAdminId());
 			user.setSource(2);// 客户来源设置为领取
+			//领取客户新增判定有效,领取自己的需要大于180天
+			addPrivateValid(uid);
 			addUserTransferLog(uid, aid, null,1, null, now, uList);
 			updateUserMid(aid,uid,0,null);
 			//转交
@@ -1426,7 +1428,37 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return errors;
 	}
 
+	private void addPrivateValid(String uid) {
+		List<transferListBo> transferListBos = userTransferLogMapper.selectByUidGetList(uid);
+		//获取我的最后一个操作数据
+		boolean flag = false;
+		if(transferListBos.isEmpty()){
+			//没有操作数据则是有效新增
+			flag = true;
+		}else{
+			//有数据就看最后一条当前人的操作时间
+			List<transferListBo> collect = transferListBos.stream().filter(e -> e.getAid().equals(TokenManager.getAdminId())).collect(Collectors.toList());
+			if(collect.isEmpty()){
+				//没有操作数据则是有效新增
+				flag = true;
+			}else{
+				//获取最新数据
+				collect.sort(Comparator.comparing(transferListBo -> transferListBo.getCreateTime().getTime()));
+				transferListBo transferListBo = collect.get(collect.size()-1);
+				if(transferListBo.getCreateTime().getTime() < System.currentTimeMillis() - 180 * 24 * 60 * 60 * 1000){
+					flag = true;
+				}else{
+					flag = false;
+				}
+			}
 
+		}
+		if (flag){
+			System.out.println("========================是有效数据");
+		}else{
+			System.out.println("========================无效数据");
+		}
+	}
 
 
 	@Override