anderx 4 anni fa
parent
commit
de07148967

+ 11 - 9
src/main/java/com/goafanti/common/bo/userDaysBo.java

@@ -6,8 +6,9 @@ public class userDaysBo {
 	private String aid;
 	private String name;
 	private Integer recovery;
-	private Integer type;
+	private Integer channel;
 
+	
 	public String getUid() {
 		return uid;
 	}
@@ -32,14 +33,7 @@ public class userDaysBo {
 		this.name = name;
 	}
 
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
+	
 	public Integer getRecovery() {
 		return recovery;
 	}
@@ -48,4 +42,12 @@ public class userDaysBo {
 		this.recovery = recovery;
 	}
 
+	public Integer getChannel() {
+		return channel;
+	}
+
+	public void setChannel(Integer channel) {
+		this.channel = channel;
+	}
+
 }

+ 3 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -46,6 +46,9 @@ public class AFTConstants {
 	/** 专利管理员 */
 	public static final String  PATENT_AUDITOR 	                  	= "9992";				
 
+	public static final String  CHANNEL                      		= "90";		
+	
+	public static final String  CHANNEL_DIRECTOR                    = "9980";		
 	/** 地区管理员*/
 	public static final String	AREAADMIN							= "";					
 	/** 审核员*/

+ 6 - 1
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -54,7 +54,12 @@ public enum NoticeStatus {
 	PAYMENT_NO(45,"付款驳回通知"),
 	PAYMENT_YES(46,"付款通过通知"),
 	PAYMENT_COMPLETE(47,"财务付款通知"),
-	CUSTOMER_PRIVATE_REMINDER(48,"客户丢失提醒"),
+	CUSTOMER_PRIVATE_REMINDER(48,"限时跟进提醒"),
+	CUSTOMER_LOSE_REMINDER(49,"限时丢失提醒"),
+	CUSTOMER_LOSE30(50,"客户释放(30天)"),
+	CUSTOMER_LOSE270(51,"客户释放(270天)"),
+	CUSTOMER_CHENNEL_RECOVERY(52,"渠道客户回收"),
+	CUSTOMER_CHENNEL_LOSE(53,"渠道客户丢失"),
 	OTHER(0, "其他");
 
 	private NoticeStatus(Integer code, String desc) {

+ 5 - 5
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -379,7 +379,7 @@
   <select id="selectWaitReleaseCustomer" resultType="com.goafanti.customer.bo.LockingReleaseBo">
 	select 
 		t0.id, t0.uid, t0.aid, t0.lock_time lockTime,
-		t1.last_follow_time lastFollowTime
+		t1.last_follow_time lastFollowTime,u.nickname userName
 	from
 		(select id,uid,aid,lock_time from user_lock_release where aid = #{aid} and type = 0 and status = 0)t0
 	left join 
@@ -451,14 +451,14 @@
   </select>
   
   <select id="selectUserDays" resultType="com.goafanti.common.bo.userDaysBo">
-  select  t0.uid, t0.aid, u.nickname name ,1 type
+  select  t0.uid, t0.aid, u.nickname name ,u.channel 
 	from
 		(select id,uid,aid,lock_time from user_lock_release where aid = #{aid} and type = 0 and status = 0)t0
 	left join 
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid 
 	left join user u on t0.uid=u.id
-	where u.channel=0
+	where 1=1
 	and (datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))> #{x} 
 		or datediff(now(),t0.lock_time)> #{y})
   </select>
@@ -473,13 +473,13 @@
   </select>
   
   <select id="selectChannelNotFollow" resultType="com.goafanti.common.bo.userDaysBo">
-  	 select  t0.uid, t0.aid, u.nickname name ,2 type
+  	 select  t0.uid, t0.aid, u.nickname name ,u.channel
 	from `user` u
 	inner join (select id,uid,aid,lock_time from user_lock_release where type = 0 and status = 0 group by aid,uid)t0 on t0.uid=u.id
 	left join 
 		(select uid,aid,max(create_time) as last_follow_time from user_follow  group by aid,uid)t1
 	on t0.uid = t1.uid  and t0.aid=t1.aid
-	where u.channel =1 
+	where 1=1 
 	and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time)) &gt; #{days} 
   </select>
   

+ 74 - 19
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2093,20 +2093,42 @@ inner join(
     left join district_glossory d2 on c.location_city =d2.id
     left join admin e on a.aid =e.id
     left join admin f on b.aid=f.id
-    where a.status in (0,1,2,6,7)
+    where 1=1
     <if test="status !=null">
     and a.status = #{status}
     </if>
-    <if test="type==0"><!-- 营销员 -->
-    and a.status not in(0,6) 
+    <!-- 0营销员 1渠道专员 2营销总监 3营销经理 4释放 5未分配 6已分配 7已签单 -->
+    <if test="type==0">
+    and a.status  in(1,2,7) 
     and b.aid= #{aid}
     </if>
-    <if test="type==1 and aid!=null"><!-- 渠道专员 -->
+    <if test="type==1">
+    and a.status in (0,1,2,6,7)
     and a.aid= #{aid}
     </if>
-    <if test="maid !=null">
+    <if test="type==2">
+    and a.status in (0,1,2,6,7)
+    </if>
+    <if test="type==3">
+    and a.status in (0,1,2,6,7)
     and a.maid= #{maid}
     </if>
+    <if test="type==4">
+    and a.status  =8 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==5">
+    and a.status  in(0,6) 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==6">
+    and a.status  in(1,2) 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==7">
+    and a.status  =7 
+    and a.aid= #{aid}
+    </if>
     <if test="province !=null">
     and  c.location_province= #{province}
     </if>
@@ -2127,20 +2149,42 @@ inner join(
   <select id="selectChannelCustomerCount" resultType="java.lang.Integer">
    select count(*) from user_channel a
     left join user b on a.uid=b.id  left join organization_identity c on a.uid =c.uid 
-    where a.status in (0,1,2,6,7)
+    where 1=1
     <if test="status !=null">
     and a.status = #{status}
     </if>
-      <if test="type==0"><!-- 营销员 -->
-    and a.status not in(0,6) 
+    <!-- 0营销员 1渠道专员 2营销总监 3营销经理 4释放 5未分配 6已分配 7已签单 -->
+    <if test="type==0">
+    and a.status  in(1,2,7) 
     and b.aid= #{aid}
     </if>
-    <if test="type==1 and aid!=null"><!-- 渠道专员 -->
+    <if test="type==1">
+    and a.status in (0,1,2,6,7)
     and a.aid= #{aid}
     </if>
-    <if test="maid !=null">
+    <if test="type==2">
+    and a.status in (0,1,2,6,7)
+    </if>
+    <if test="type==3">
+    and a.status in (0,1,2,6,7)
     and a.maid= #{maid}
     </if>
+      <if test="type==4">
+    and a.status  =8 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==5">
+    and a.status  in(0,6) 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==6">
+    and a.status  in(1,2) 
+    and a.aid= #{aid}
+    </if>
+    <if test="type==7">
+    and a.status  =7 
+    and a.aid= #{aid}
+    </if>
     <if test="province !=null">
     and  c.location_province= #{province}
     </if>
@@ -2188,11 +2232,16 @@ inner join(
   </select>
   
   <select id="selectChannelCountsList" resultType="com.goafanti.customer.bo.OutChannelCounts">
- 		select b.name,b.id aid,a.counts,a.wfp unallocated,a.yfp allocated,a.yqd sign,a.ysf common
- 	from (select t1.aid,count(1)counts ,sum(t1.wfp)wfp,sum(t1.yfp)yfp,sum(t1.yqd)yqd,sum(t1.ysf)ysf from 
-	(select x.aid,x.uid,if(x.distribution_time is null ,1,0)wfp,if(x.distribution_time is not  null,1,0)yfp
-	,if(y.sign_bills =1,1,0)yqd,if(y.share_type=1,1,0)ysf from user_channel x left join user y on x.uid =y.id
-	where 1=1 and x.status in (0,1,2,6,7)
+ 	select b.name,b.id aid,a.counts,a.wfp unallocated,a.yfp allocated,a.yqd sign,a.ysf common
+ 	from (select t1.aid,sum(tj)counts ,sum(t1.wfp)wfp,sum(t1.yfp)yfp,sum(t1.yqd)yqd,sum(t1.ysf)ysf from 
+	(select x.aid,x.uid,
+	if(x.status=8,0,1) tj,
+	case x.status  when 0 then 1 when 6 then 1 else 0 end as  wfp,
+	case x.status  when 1 then 1 when 2 then 1 else 0 end as  yfp,
+	case x.status  when 7 then 1 else 0 end as  yqd,
+	case x.status  when 8 then 1 else 0 end as  ysf 
+	from user_channel x left join user y on x.uid =y.id
+	where 1=1 and x.status in (0,1,2,6,7,8)
 	<if test="type==0 and startTime !=null and endTime !=null">
 	and  x.create_time between  #{startTime} and #{endTime}
 	</if>
@@ -2209,11 +2258,17 @@ inner join(
 	</if>
   </select>
   <select id="selectChannelCountsCount" resultType="java.lang.Integer">
-    select count(*) from (select ifnull(count(*),0) 
+    	select count(*)   
   from 
-	(select x.aid,x.uid,if(x.distribution_time is null ,1,0)wfp,if(x.distribution_time is not  null,1,0)yfp
-	,if(y.sign_bills =1,1,0)yqd,if(y.share_type=1,1,0)ysf from user_channel x left join user y on x.uid =y.id
-	where 1=1 and x.status in (0,1,2,6,7)
+	(select t1.aid,sum(tj)counts ,sum(t1.wfp)wfp,sum(t1.yfp)yfp,sum(t1.yqd)yqd,sum(t1.ysf)ysf from 
+	(select x.aid,x.uid,
+	if(x.status=8,0,1) tj,
+	case x.status  when 0 then 1 when 6 then 1 else 0 end as  wfp,
+	case x.status  when 1 then 1 when 2 then 1 else 0 end as  yfp,
+	case x.status  when 7 then 1 else 0 end as  yqd,
+	case x.status  when 8 then 1 else 0 end as  ysf 
+	from user_channel x left join user y on x.uid =y.id
+	where 1=1 and x.status in (0,1,2,6,7,8)
 	<if test="type==0 and startTime !=null and endTime !=null">
 	and  x.create_time between  #{startTime} and #{endTime}
 	</if>

+ 34 - 4
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import com.goafanti.admin.bo.NoticeBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
@@ -73,15 +74,24 @@ public class ReleaseUserTask {
 			if (!userTmpList.isEmpty())
 				count.addAll(userTmpList);
 		}
-		List<userDaysBo> userChannelList = customerService.selectChannelNotFollow();
-		if (!userChannelList.isEmpty())
-			count.addAll(userChannelList);
 		List<Notice> ln = new ArrayList<>();
 		for (userDaysBo ub : count) {
 			String str=null;  
-			if (ub.getType() == 1) {
+			if (ub.getChannel() == 0) {
 				str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "私有", ub.getName());
 			}else {
+				str = String.format("您的%s客户【%s】剩余天数不足十五天,请及时跟进或者限时签单!", "渠道", ub.getName());
+			}
+			ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, ub.getAid(),
+					NoticeStatus.CUSTOMER_LOSE_REMINDER.getCode(), str,ub.getUid()));
+		}
+		//查询15天未跟进
+		List<userDaysBo> userChannelList = customerService.selectChannelNotFollow();
+		for (userDaysBo ub : userChannelList) {
+			String str=null;  
+			if (ub.getChannel() == 0) {
+				str = String.format("您的%s客户【%s】已经十五天未跟进,请及时跟进或者限时签单!", "私有", ub.getName());
+			}else {
 				str = String.format("您的%s客户【%s】已经十五天未跟进,请及时跟进或者限时签单!", "渠道", ub.getName());
 			}
 			ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, ub.getAid(),
@@ -114,6 +124,7 @@ public class ReleaseUserTask {
 			List<LockingReleaseBo> lockUserList = new ArrayList<LockingReleaseBo>();
 			List<LockingReleaseBo> userTmpList = null;
 			List<LockingReleaseBo> userTmpList2 = null;
+			List<Notice> ln = new ArrayList<>();
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
 					if (StringUtils.isNotBlank(u.getId())) {
@@ -158,6 +169,7 @@ public class ReleaseUserTask {
 					if (pointsDataLimit == (hsList.size()+sfList.size()) || i == userChannelList.size() - 1) {
 						if(!hsList.isEmpty())userService.pushReleaseUserChannel(hsList,0);
 						if(!sfList.isEmpty())userService.pushReleaseUserChannel(sfList,1);
+						addChannelNotice(hsList,sfList);
 						hsList.clear();
 						sfList.clear();
 						Thread.sleep(2000);
@@ -183,4 +195,22 @@ public class ReleaseUserTask {
 		LoggerUtils.debug(getClass(), "==============客户释放完成============");
 	}
 
+	private void addChannelNotice(List<userDaysBo> hsList, List<userDaysBo> sfList) {
+		List<Notice> nl=new ArrayList<Notice>();
+		for (userDaysBo hs : hsList) {
+			nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, hs.getAid(),
+					NoticeStatus.CUSTOMER_CHENNEL_RECOVERY.getCode(), 
+					String.format("您的%s客户【%s】已经90天未跟进,已经自动回收!", "渠道", hs.getName()),
+					hs.getUid()));
+		}
+		
+		for (userDaysBo sf : sfList) {
+			nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, sf.getAid(),
+					NoticeStatus.CUSTOMER_CHENNEL_LOSE.getCode(), 
+					String.format("您的%s客户【%s】已经90天未跟进,已经自动释放!", "渠道", sf.getName()),
+					sf.getUid()));
+		}
+		noticeMapper.insertBatch(nl);
+	}
+
 }

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

@@ -8,7 +8,7 @@ public class InputListChannel {
 	private Integer status;
 	private String aid;
 	/**
-	 * 0营销员 1渠道专员 2营销总监
+	 * 0营销员 1渠道专员 2营销总监 3营销经理 4释放 5未分配 6已分配 7已签单
 	 */
 	private Integer type;
 	private String startTime;

+ 8 - 0
src/main/java/com/goafanti/customer/bo/LockingReleaseBo.java

@@ -11,7 +11,9 @@ public class LockingReleaseBo {
 	private String salesmanName;
 	private String lastFollowTime;
 	private String lastSignTime;
+	private String userName;
 	private Integer mySign;
+	
 	public String getId() {
 		return id;
 	}
@@ -78,4 +80,10 @@ public class LockingReleaseBo {
 	public void setMySign(Integer mySign) {
 		this.mySign = mySign;
 	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
 }

+ 54 - 36
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.alibaba.druid.sql.parser.Token;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.userDaysBo;
 import com.goafanti.common.constant.AFTConstants;
@@ -32,6 +31,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.BusinessGlossoryMapper;
 import com.goafanti.common.dao.BusinessProjectMapper;
+import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationAnnualReportMapper;
 import com.goafanti.common.dao.OrganizationApplicationInfoMapper;
 import com.goafanti.common.dao.OrganizationBusinessScopeMapper;
@@ -51,11 +51,13 @@ import com.goafanti.common.enums.ChannelStatus;
 import com.goafanti.common.enums.CustomerStatusFiled;
 import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IdentityProcess;
+import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserLockReleaseStatus;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationApplicationInfo;
 import com.goafanti.common.model.OrganizationBusinessScope;
 import com.goafanti.common.model.OrganizationContactBook;
@@ -124,6 +126,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Resource
 	private AdminMapper adminMapper;
 	@Resource
+	private NoticeMapper noticeMapper;
+	@Resource
 	private OrganizationApplicationInfoMapper organizationApplicationInfoMapper;
 	@Resource
 	private OrganizationAnnualReportMapper organizationAnnualReportMapper;
@@ -791,16 +795,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	private void followProject(String uid, int x) {
 		Date date = new Date();
 		String aid = TokenManager.getAdminId();
-		if(x==0) {
-			if (userLockReleaseMapper.updateUserMid(uid,aid,date,null)<1) {
-				userLockReleaseMapper.insertUserMid(uid,aid,date,null);
+		if (x == 0) {
+			if (userLockReleaseMapper.updateUserMid(uid, aid, date, null) < 1) {
+				userLockReleaseMapper.insertUserMid(uid, aid, date, null);
 			}
-		}else {
-			if (userLockReleaseMapper.updateUserMid(uid,aid,date,date)<1) {
-				userLockReleaseMapper.insertUserMid(uid,aid,date,date);
+		} else {
+			if (userLockReleaseMapper.updateUserMid(uid, aid, date, date) < 1) {
+				userLockReleaseMapper.insertUserMid(uid, aid, date, date);
 			}
 		}
-			
+
 	}
 
 	@SuppressWarnings("unused")
@@ -2035,6 +2039,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				newList.add(list.get(i));
 				if (50 == newList.size() || i == list.size() - 1) {
 					if (newList.size() > 0) {
+						// 处理日志
 						List<UserTransferLog> list3 = new ArrayList<UserTransferLog>();
 						for (LockingReleaseBo lrb : newList) {
 							UserTransferLog utl = new UserTransferLog();
@@ -2048,13 +2053,29 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 							list3.add(utl);
 						}
 						userTransferLogMapper.insertList(list3);
+						// 处理通知
+						List<Notice> ln = new ArrayList<>();
+						for (LockingReleaseBo lrb : newList) {
+							String str = null;
+							Integer code = null;
+							if (type == 0) {
+								str = String.format("您的%s客户【%s】30天未跟进已释放!", "私有", lrb.getUserName());
+								code = NoticeStatus.CUSTOMER_LOSE30.getCode();
+							} else if (type == 1) {
+								str = String.format("您的%s客户【%s】270天未签单已释放!", "私有", lrb.getUserName());
+								code = NoticeStatus.CUSTOMER_LOSE270.getCode();
+							}
+							ln.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, lrb.getAid(), code, str,
+									lrb.getUid()));
+						}
+						noticeMapper.insertBatch(ln);
 					}
-					newList.clear();
-					Thread.sleep(2000);
 				}
+				newList.clear();
+				Thread.sleep(2000);
 			}
-		}
 
+		}
 	}
 
 	@Override
@@ -2073,15 +2094,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			params.put("startTime", in.getStartTime());
 		if (StringUtils.isNotBlank(in.getEndTime()))
 			params.put("endTime", in.getEndTime() + " 23:59:59");
-		if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR)||TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			
-		}else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)) {
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR) || TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+
+		} else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)) {
 			params.put("maid", TokenManager.getAdminId());
-		}else {
-			params.put("aid", in.getAid()==null?TokenManager.getAdminId():in.getAid());
-			
 		}
-		
+		params.put("aid", in.getAid() == null ? TokenManager.getAdminId() : in.getAid());
 		return findPage("selectChannelCustomerList", "selectChannelCustomerCount", params, in.getPageNo(),
 				in.getPageSize());
 
@@ -2090,8 +2108,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public Object pushChannelDeliver(List<String> uids, String receiveId, String remarks, Integer type) {
 		Date date = new Date();
-		Integer i=userMapper.updatechannelCustomerDeliver(uids, receiveId);
-		Integer status=null;
+		Integer i = userMapper.updatechannelCustomerDeliver(uids, receiveId);
+		Integer status = null;
 		if (i > 0) {
 			List<UserTransferLog> l = new ArrayList<UserTransferLog>();
 			for (String string : uids) {
@@ -2113,22 +2131,22 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			}
 			userTransferLogMapper.insertList(l);
 		}
-		if (type!=2) {
-			userLockReleaseMapper.insertChannelList(uids,receiveId);
-			String role=userMapper.checkRoleMax(receiveId);
+		if (type != 2) {
+			userLockReleaseMapper.insertChannelList(uids, receiveId);
+			String role = userMapper.checkRoleMax(receiveId);
 			if (role.equals(AFTConstants.SALESMAN_MANAGER)) {
-				status=ChannelStatus.YFPJL.getCode();
-			}else {
-				status=ChannelStatus.YFPYXY.getCode();
+				status = ChannelStatus.YFPJL.getCode();
+			} else {
+				status = ChannelStatus.YFPYXY.getCode();
 			}
-		}else {
+		} else {
 			userLockReleaseMapper.updateChannelList(uids);
-			status=ChannelStatus.HT.getCode();
+			status = ChannelStatus.HT.getCode();
 		}
-		if(type==0) {
-			userChannelMapper.updateByuids(uids, type, date,receiveId,status);
-		}else {
-			userChannelMapper.updateByuids(uids, type, date,null,status);
+		if (type == 0) {
+			userChannelMapper.updateByuids(uids, type, date, receiveId, status);
+		} else {
+			userChannelMapper.updateByuids(uids, type, date, null, status);
 		}
 		organizationContactBookMapper.updateByUids(uids, receiveId);
 		return 1;
@@ -2166,10 +2184,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public List<userDaysBo> selectChannelNotFollow(){ 
-			Integer days = 15;
-			return userLockReleaseMapper.selectChannelNotFollow(days);
-		}
+	public List<userDaysBo> selectChannelNotFollow() {
+		Integer days = 15;
+		return userLockReleaseMapper.selectChannelNotFollow(days);
+	}
 
 	@Override
 	public Object listChannelCounts(InputChannelCounts in) {

+ 1 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -377,6 +377,7 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	@Override
 	public void pushReleaseUserChannel(List<userDaysBo> newCList,Integer type) {
 		userMapper.updateReleaseUserChannel(newCList,type);
+		//通知
 		
 	}