sop

fs-common/src/main/java/com/fs/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
@@ -17,6 +19,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -38,13 +41,16 @@ public class BaseEntity implements Serializable
 
     /** 开始时间 */
     @JsonIgnore
+    @TableField(exist = false)
     private String beginTime;
 
     /** 结束时间 */
     @JsonIgnore
+    @TableField(exist = false)
     private String endTime;
 
     /** 请求参数 */
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

fs-service-system/src/main/java/com/fs/qw/domain/QwExternalContact.java

@@ -120,6 +120,6 @@ public class QwExternalContact extends BaseEntity
     private Date firstTime;
 
     private Integer lastWatchTime;
-    private Integer repeat;
+    private Integer isRepeat;
 
 }

fs-service-system/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -23,21 +23,18 @@ import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.service.IFsCourseLinkService;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.mapper.CrmCustomerMapper;
-import com.fs.fastGpt.param.SendHookAIParam;
-import com.fs.qw.param.newparam.ExternalContactPageListParam;
-import com.fs.qw.vo.newvo.ExternalContactDetailsVO;
-import com.fs.qw.vo.newvo.ExternalContactListVO;
-import com.fs.qw.vo.newvo.ExternalContactNumVO;
-import com.fs.qw.vo.newvo.ExternalContactPageVO;
-import com.fs.store.domain.FsUser;
-import com.fs.store.mapper.FsUserMapper;
 import com.fs.qw.domain.*;
 import com.fs.qw.mapper.*;
 import com.fs.qw.param.*;
+import com.fs.qw.param.newparam.ExternalContactPageListParam;
 import com.fs.qw.result.QwExternalContactLogVo;
 import com.fs.qw.result.QwExternalContactVo;
 import com.fs.qw.service.*;
 import com.fs.qw.vo.*;
+import com.fs.qw.vo.newvo.ExternalContactDetailsVO;
+import com.fs.qw.vo.newvo.ExternalContactListVO;
+import com.fs.qw.vo.newvo.ExternalContactNumVO;
+import com.fs.qw.vo.newvo.ExternalContactPageVO;
 import com.fs.qwApi.Result.QwOpenidResult;
 import com.fs.qwApi.domain.*;
 import com.fs.qwApi.domain.inner.*;
@@ -58,8 +55,8 @@ import com.fs.store.mapper.FsUserMapper;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.service.ISysConfigService;
 import com.fs.voice.utils.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
-//import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -88,6 +85,7 @@ import java.util.stream.Stream;
  * @author fs
  * @date 2024-06-20
  */
+@Slf4j
 @Service
 public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactMapper, QwExternalContact> implements IQwExternalContactService {
 
@@ -1219,10 +1217,10 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
             List<QwExternalContact> externalContactList = qwExternalContactMapper.selectList(new QueryWrapper<QwExternalContact>().eq("external_user_id", externalUserID).eq("corp_id", corpId));
             if(!externalContactList.isEmpty()){
                 externalContactList.forEach(e -> {
-                    e.setRepeat(1);
+                    e.setIsRepeat(1);
                 });
                 qwExternalContactService.updateBatchById(externalContactList);
-                qwExternalContact.setRepeat(1);
+                qwExternalContact.setIsRepeat(1);
             }
         }
 
@@ -1243,9 +1241,9 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         if (isNewQwExternalContact) {
             qwExternalContact.setName("待同步客户");
             qwExternalContact.setGender(0);
-            qwExternalContactMapper.insertQwExternalContact(qwExternalContact);
+            qwExternalContactMapper.insert(qwExternalContact);
         } else {
-            qwExternalContactMapper.updateQwExternalContact(qwExternalContact);
+            qwExternalContactMapper.updateById(qwExternalContact);
         }
 
         QwExternalContact contact = qwExternalContact;
@@ -1518,6 +1516,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 String tagRemark = null;
                 //根据qwUser 匹配 分时段的标签
                 QwAutoTags qwAutoTags = qwAutoTagsMapper.selectQwAutoTagsByIdJSON(corpId, qwUser.getId());
+                log.info("自动打标签方案{}", qwAutoTags);
                 if (qwAutoTags != null) {
                     //标签日志记录
                     qwAutoTagsLogs.setAutoTagId(qwAutoTags.getId());
@@ -1543,11 +1542,12 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                         String startTime = rulesTags.getStartTime();
                         String endTime = rulesTags.getEndTime();
                         String remarks = rulesTags.getRemarks();
-
+                        log.info("自动打标签开始时间：{} 到 {}， time：{} 到 {}", startDate, endDate, startTime, endTime);
                         // 检查今天是否在 week 集合中
 //                        boolean isTodayInWeek = week.contains(todayIndex);
                         boolean isToday = false;
-                        if(startDate == null || endDate == null){
+                        if(startDate != null && endDate != null){
+                            log.info("进入日期判断");
                             isToday = !nowDate.isBefore(startDate) && !nowDate.isAfter(endDate);
                         }
                         // 转换时间字符串为 LocalTime
@@ -1555,6 +1555,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                         LocalTime end = LocalTime.parse(endTime.equals("24:00") ? "23:59:59" : endTime);
                         // 检查当前时间是否在 startTime 和 endTime 之间
                         boolean isNowInTimeRange = !now.isBefore(start) && !now.isAfter(end);
+                        log.info("是否满足时间打标签：天：{}， 时：{}", isToday, isNowInTimeRange);
+                        log.info("是否每天{}", rulesTags.getEveryDay());
                         // 如果当前时间和日期匹配规则，将 tagsItem 添加到 combinedTagsSet 中
                         if (((rulesTags.getEveryDay() != null && rulesTags.getEveryDay() == 1) || isToday) && isNowInTimeRange) {
 

fs-service-system/src/main/java/com/fs/store/service/IFsUserService.java

@@ -11,7 +11,6 @@ import com.fs.qw.vo.QwFsUserVO;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStoreOrderItem;
 import com.fs.store.domain.FsUser;
-
 import com.fs.store.dto.FsUserTransferParamDTO;
 import com.fs.store.param.SelectCusListPageParam;
 import com.fs.store.param.h5.FsUserPageListParam;
@@ -23,6 +22,8 @@ import com.fs.store.vo.h5.UserDetailsVO;
 import com.fs.store.vo.h5.UserListPageVO;
 import com.fs.store.vo.h5.*;
 
+import java.util.List;
+
 /**
  * 用户Service接口
  *