zoujiajian 2 years ago
parent
commit
b083d3add7

+ 2 - 3
netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpCustomerAcquisitionLinkServiceImpl.java

@@ -70,7 +70,6 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
     @Transactional(rollbackFor = Throwable.class)
     public void up(CorpCustomerAcquisitionLink corpCustomerAcquisitionLink) throws Exception {
         CorpCustomerAcquisitionLink link = getById(corpCustomerAcquisitionLink.getId());
-        String oldUserList = link.getUserList();
         link.setLinkName(corpCustomerAcquisitionLink.getLinkName());
         link.setUserList(corpCustomerAcquisitionLink.getUserList());
 
@@ -98,13 +97,13 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
         Boolean isDuty = Optional.ofNullable(corpCustomerAcquisitionLink.getIsDuty()).orElse(false);
         if (!isDuty) {
             corpCustomerAcquisitionLink.setChooseDutyUsers(null);
-        } else if (StrUtil.isEmpty(corpCustomerAcquisitionLink.getChooseDutyUsers())) {
+        } else {
             corpCustomerAcquisitionLink.setChooseDutyUsers(corpCustomerAcquisitionLink.getUserList());
         }
 
         this.updateById(corpCustomerAcquisitionLink);
 
-        if (corpCustomerAcquisitionLink.getIsDuty() != null && corpCustomerAcquisitionLink.getIsDuty() && !StrUtil.equals(oldUserList, corpCustomerAcquisitionLink.getUserList())) {
+        if (corpCustomerAcquisitionLink.getIsDuty() != null && corpCustomerAcquisitionLink.getIsDuty()) {
             handleCorpLinkSchedulerJob();
         }
     }

+ 1 - 5
netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpCustomerAcquistionServiceImpl.java

@@ -55,8 +55,6 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
         CorpCustomerAcquisitionLinkPopularize corpCustomerAcquisitionLinkPopularize = corpCustomerAcquisitionLinkPopularizeMapper.selectById(linkId);
         Long customerAcquistionLinkId = corpCustomerAcquisitionLinkPopularize.getCustomerAcquistionLinkId();
         CorpCustomerAcquisitionLink corpCustomerAcquisitionLink = corpCustomerAcquisitionLinkMapper.selectById(customerAcquistionLinkId);
-        //更新值班获客链接
-        resetAcLinkConfigIfDuty(corpCustomerAcquisitionLink);
         return corpCustomerAcquisitionLink.getUrl();
     }
 
@@ -83,7 +81,6 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
     @Override
     public String getActiveCustomerAcquistionById(Long acLinkId) throws Exception {
         CorpCustomerAcquisitionLink corpCustomerAcquisitionLink = corpCustomerAcquisitionLinkMapper.selectById(acLinkId);
-        resetAcLinkConfigIfDuty(corpCustomerAcquisitionLink);
         return corpCustomerAcquisitionLink.getUrl();
     }
 
@@ -106,10 +103,9 @@ public class CorpCustomerAcquistionServiceImpl implements CorpCustomerAcquistion
                     if (chooseDutyUsers == null) {
                         chooseDutyUsers = userList;
                     }
-                    List<Integer> chooseUserList = Jsons.parseList(chooseDutyUsers, Integer.class);
 
                     Set<Integer> fitUsers = dutyServices.stream().filter(e -> users.contains(e)).collect(Collectors.toSet());
-                    if (CollUtil.isNotEmpty(fitUsers) && (fitUsers.size() != chooseUserList.size() || !chooseUserList.containsAll(fitUsers))) {
+                    if (CollUtil.isNotEmpty(fitUsers)) {
 
                         corpCustomerAcquisitionLink.setChooseDutyUsers(Jsons.toJson(fitUsers));