Browse Source

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 2 weeks ago
parent
commit
578de2859b

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

@@ -1337,7 +1337,7 @@
                ifnull(b2.counts,0) monthCustomer,ifnull(c2.counts,0) monthMeet,ifnull(b3.counts,0) yearCustomer,ifnull(c3.counts,0) yearMeet
         from admin a
                  left join (select aid ,count(*)counts  from user
-                            where share_type in (0,2)and source in (1,2)
+                            where share_type in (0)and source in (1,2) and private_valid=1
                               and transfer_time BETWEEN #{d1} and #{d2}
                             group by aid) b on a.id =b.aid
                  left join (SELECT a.aid,count(*) counts

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

@@ -2244,6 +2244,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		List<LockingReleaseBo> list = new ArrayList<>();
 		//u.channel=0 and u.share_type=0   私有和私有渠道客户 30
 		//u.share_type in(0) and  u.channel=0 and u.new_channel=0  私有 非渠道270
+		//270天丢失,只有一直跟进的客户要丢,如果丢失领取时间刷新时间,触发不到30天
 		List<LockingReleaseBo> lockingReleaseBos = userLockReleaseMapper.selectWaitReleaseCustomer(uid);
 		for (LockingReleaseBo bo : lockingReleaseBos) {
 			//释放非渠道客户和渠道其他分类(不包含空)的客户