客户咨询记录

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -153,6 +153,11 @@ public class ClubApi {
             @ApiImplicitParam(required = false, name = "leaderId", value = "管理员协销id"),
             @ApiImplicitParam(required = false, name = "groupId", value = "组员协销id"),
             @ApiImplicitParam(required = false, name = "manager", value = "是否是协销总管理员标记 1是，2否"),
+            @ApiImplicitParam(required = true, name = "clubType", value = "机构类型"),
+            @ApiImplicitParam(required = false, name = "pinceSensitve", value = "价格敏感度"),
+            @ApiImplicitParam(required = false, name = "satisfied", value = "意向程度"),
+            @ApiImplicitParam(required = false, name = "followup", value = "跟进状态"),
+            @ApiImplicitParam(required = false, name = "extra", value = "额外说明"),
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
@@ -163,11 +168,24 @@ public class ClubApi {
                                                                String endAddTime,
                                                                String consult,
                                                                Integer leaderId,
-                                                               Integer groupId,
                                                                Integer manager,
+                                                               String clubType,
+                                                               String pinceSensitve,
+                                                               String satisfied,
+                                                               String followup,
+                                                               String extra,
+                                                               Integer groupId,
                                                                @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return clubService.getRemarksList(serviceProviderId, keyWord, startAddTime, endAddTime, consult, leaderId, groupId,manager, pageNum, pageSize);
+        return clubService.getRemarksList(serviceProviderId, keyWord, startAddTime, endAddTime, consult, leaderId, manager, clubType, pinceSensitve, satisfied, followup, extra, groupId, pageNum, pageSize);
+    }
+
+    @ApiOperation("关键词库联想查询")
+    @ApiImplicitParam(required = true, name = "remarks", value = "联想词")
+    @GetMapping("/remarks/cmremarkslist")
+    public ResponseJson getCmRemarksList(String remarks) {
+
+        return clubService.getCmRemarksList(remarks);
     }
 
     @ApiOperation("机构资料备注详情")
@@ -243,7 +261,7 @@ public class ClubApi {
     })
     @GetMapping("/remarks/visitor/list")
     public ResponseJson<PaginationVo<VisitorRemarkVo>> getVisitorList(Integer serviceProviderId,
-//                                                                      String keyWord,
+
 //                                                                      String startAddTime,
 //                                                                      String endAddTime,
 //                                                                      String consult,
@@ -256,7 +274,7 @@ public class ClubApi {
             return ResponseJson.error("参数异常：协销id不能为空！", null);
         }
 //        keyWord, startAddTime, endAddTime, consult, leaderId, groupId,manager,
-        return clubService.getVisitorList(serviceProviderId,  pageNum, pageSize);
+        return clubService.getVisitorList(serviceProviderId,pageNum, pageSize);
     }
 
     /**
@@ -329,12 +347,17 @@ public class ClubApi {
                                                                           Integer leaderId,
                                                                           Integer groupId,
                                                                           Integer manager,
+                                                                          String clubType,
+                                                                          String pinceSensitve,
+                                                                          String satisfied,
+                                                                          String followup,
+                                                                          String extra,
                                                                           @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                           @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == serviceProviderId) {
             return ResponseJson.error("参数异常：协销id不能为空！", null);
         }
-        return clubService.getVisitorRecordList(questionManId,keyWord,serviceProviderId,startAddTime,endAddTime,consult,leaderId,groupId,manager,pageNum, pageSize);
+        return clubService.getVisitorRecordList(questionManId, keyWord, serviceProviderId, startAddTime, endAddTime, consult, leaderId, groupId, manager,clubType,pinceSensitve, satisfied,followup,extra, pageNum, pageSize);
     }
 
     @ApiOperation("删除潜在用户资料备注")

src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -273,7 +273,7 @@ public interface ClubMapper {
 
     String findQuestionMan(String questionManId);
 
-    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime, @Param("con")List<String> con);
+    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,@Param("pinceSensitve") String pinceSensitve, @Param("con")List<String> con);
 
     List<VisitorRemarkVo> getVisitorListByKey(@Param("serviceProviderId") Integer serviceProviderId, @Param("keyWord") String keyWord,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,@Param("con")List<String> con);
     //, @Param("questionManId") String questionManId
@@ -287,9 +287,11 @@ public interface ClubMapper {
 
     ConsultVo findConsultById(String string);
 
-    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId, @Param("con")List<String> con);
+    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") String followup,@Param("satisfied") String satisfied,@Param("pinceSensitve") String pinceSensitve, @Param("con")List<String> con);
 
-    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("con")List<String> con);
+    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") String followup,@Param("satisfied") String satisfied,@Param("pinceSensitve") String pinceSensitve,@Param("con")List<String> con);
 
     Integer findLeaderId(Integer serviceProviderId);
+
+    List<CmRemarksVo> getCmRemarksList(String remarks);
 }

src/main/java/com/caimei365/user/model/po/ClubRemarksPo.java

@@ -41,4 +41,25 @@ public class ClubRemarksPo implements Serializable {
 
     @ApiModelProperty("添加时间")
     private Date addTime;
+
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
 }

src/main/java/com/caimei365/user/model/vo/CmRemarksVo.java

@@ -0,0 +1,33 @@
+package com.caimei365.user.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/5/13
+ */
+@Data
+public class CmRemarksVo {
+
+    /**
+     * 关键词ID
+     */
+    private Integer remarksId;
+
+    /**
+     * 关键词
+     */
+    private String remarks;
+
+    /**
+     * 添加时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date addtime;
+
+}

src/main/java/com/caimei365/user/model/vo/RemarkVo.java

@@ -67,4 +67,25 @@ public class RemarkVo implements Serializable {
      * 咨询类别回显
      */
     private String consultBack;
+
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
 }

src/main/java/com/caimei365/user/model/vo/RemarksVo.java

@@ -71,4 +71,25 @@ public class RemarksVo implements Serializable {
      * 管理员姓名
      */
     private String leaderName;
+
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
 }

src/main/java/com/caimei365/user/model/vo/VisitRemarkVo.java

@@ -65,4 +65,24 @@ public class VisitRemarkVo  implements Serializable {
      * 文件列表
      */
     private List<RemarksFileVo> fileList;
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
 }

src/main/java/com/caimei365/user/model/vo/VisitorRemarkVo.java

@@ -72,4 +72,25 @@ public class VisitorRemarkVo implements Serializable {
      * 记录人
      */
     private String recordName;
+
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
 }

src/main/java/com/caimei365/user/service/ClubService.java

@@ -123,7 +123,12 @@ public interface ClubService {
                                                         String consult,
                                                         Integer leaderId,
                                                         Integer manager,
-                                                        Integer groupId,int pageNum, int pageSize);
+                                                        String clubType,
+                                                        String pinceSensitve,
+                                                        String satisfied,
+                                                        String followup,
+                                                        String extra,
+                                                        Integer groupId, int pageNum, int pageSize);
 
     /**
      * 获取机构资料备注详情
@@ -163,7 +168,6 @@ public interface ClubService {
      * @return
      */
     ResponseJson<PaginationVo<VisitorRemarkVo>> getVisitorList(Integer serviceProviderId,
-//                                                               String keyWord,
 //                                                               String startAddTime,
 //                                                               String endAddTime,
 //                                                               String consult,
@@ -198,7 +202,7 @@ public interface ClubService {
      */
     ResponseJson<VisitRemarkVo> getVisitRemark(Integer remarksId);
 
-    ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId,String keyWord,Integer serviceProviderId,String startAddTime,String endAddTime,String consult,Integer leaderId,Integer groupId,Integer manager, int pageNum, int pageSize);
+    ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, String pinceSensitve,String satisfied,String followup, String extra, int pageNum, int pageSize);
 
     ResponseJson deleteVisitRemarks(String remarksId);
 
@@ -216,4 +220,6 @@ public interface ClubService {
     ResponseJson findTeams();
 
     ResponseJson findGroups(Integer leaderId);
+
+    ResponseJson getCmRemarksList(String remarks);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -2,20 +2,16 @@ package com.caimei365.user.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
 import com.caimei365.user.components.RedisService;
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.ClubMapper;
 import com.caimei365.user.mapper.RegisterMapper;
 import com.caimei365.user.mapper.SuperVipMapper;
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.dto.ClubRemarksDto;
 import com.caimei365.user.model.dto.ClubUpdateDto;
 import com.caimei365.user.model.dto.SuperVipDto;
 import com.caimei365.user.model.po.SuperVipPo;
 import com.caimei365.user.model.dto.JsonParamsDto;
-import com.caimei365.user.model.po.RemarksFilePo;
 import com.caimei365.user.model.po.ClubRemarksPo;
 import com.caimei365.user.model.po.UserBeansHistoryPo;
 import com.caimei365.user.model.po.UserPo;
@@ -24,12 +20,10 @@ import com.caimei365.user.service.ClubService;
 import com.caimei365.user.utils.ImageUtils;
 import com.caimei365.user.utils.MathUtil;
 import com.caimei365.user.utils.OssUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -390,6 +384,12 @@ public class ClubServiceImpl implements ClubService {
             String remarks = jsonObject.getString("remarks");
             String consult = jsonObject.getString("consult");
             String questionMan = jsonObject.getString("questionMan");
+
+            String clubType = jsonObject.getString("clubType");
+            String pinceSensitve = jsonObject.getString("pinceSensitve");
+            String satisfied = jsonObject.getString("satisfied");
+            String followup = jsonObject.getString("followup");
+            String extra = jsonObject.getString("extra");
             if (null == clubId) {
                 return ResponseJson.error("参数异常，机构id不能为空");
             }
@@ -405,6 +405,12 @@ public class ClubServiceImpl implements ClubService {
             clubRemarksPo.setRemarks(remarks);
             clubRemarksPo.setQuestionMan(questionMan);
             clubRemarksPo.setConsult(consult);
+
+            clubRemarksPo.setClubType(clubType);
+            clubRemarksPo.setPinceSensitve(pinceSensitve);
+            clubRemarksPo.setSatisfied(satisfied);
+            clubRemarksPo.setFollowup(followup);
+            clubRemarksPo.setExtra(extra);
             if (newRemarks) {
                 // 新增备注
                 clubMapper.insertRemarks(clubRemarksPo);
@@ -450,8 +456,13 @@ public class ClubServiceImpl implements ClubService {
                                                                String endAddTime,
                                                                String consult,
                                                                Integer leaderId,
-                                                               Integer groupId,
                                                                Integer manager,
+                                                               String clubType,
+                                                               String pinceSensitve,
+                                                               String satisfied,
+                                                               String followup,
+                                                               String extra,
+                                                               Integer groupId,
                                                                int pageNum, int pageSize) {
         if (null == serviceProviderId) {
             return ResponseJson.error("参数异常，协销id不能为空", null);
@@ -459,23 +470,23 @@ public class ClubServiceImpl implements ClubService {
         PageInfo<RemarksVo> pageInfo = null;
         Integer findLeader = clubMapper.findLeaderId(serviceProviderId);
         List<String> conss = new ArrayList<>();
-        if(StringUtils.isNotBlank(consult)){
-            if(consult.contains(",")){
+        if (StringUtils.isNotBlank(consult)) {
+            if (consult.contains(",")) {
                 conss = Arrays.asList(consult.split(","));
-            }else{
+            } else {
                 conss.add(consult);
             }
         }
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             List<String> finalConss = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, finalConss));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss));
         } else if (null != findLeader && findLeader > 0) {
             List<String> finalConss1 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, finalConss1));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, followup, satisfied, pinceSensitve, finalConss1));
         } else {
             List<String> finalConss2 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId,startAddTime,endAddTime, finalConss2));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, finalConss2));
         }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         pageInfo.getList().forEach(r -> {
@@ -511,6 +522,11 @@ public class ClubServiceImpl implements ClubService {
             remarkVo.setClubName(clubMapper.findClubName(r.getClubId()));
             remarkVo.setClubName(r.getClubName());
             remarkVo.setConsult(r.getConsult());
+            remarkVo.setClubType(r.getClubType());
+            remarkVo.setExtra(r.getExtra());
+            remarkVo.setSatisfied(r.getSatisfied());
+            remarkVo.setPinceSensitve(r.getPinceSensitve());
+            remarkVo.setFollowup(r.getFollowup());
             remarkVos.add(remarkVo);
         });
         PaginationVo<RemarkVo> pageVo = new PaginationVo<>(remarkVos);
@@ -558,7 +574,12 @@ public class ClubServiceImpl implements ClubService {
         remarkVo.setImageList(imageList);
         remarkVo.setAddTime(remarksVo.getAddTime());
         remarkVo.setConsult(remarksVo.getConsult());
-        if (StringUtils.isNotBlank(remarkVo.getConsult())) {
+        remarkVo.setClubType(remarksVo.getClubType());
+        remarkVo.setPinceSensitve(remarksVo.getPinceSensitve());
+        remarkVo.setSatisfied(remarksVo.getSatisfied());
+        remarkVo.setFollowup(remarksVo.getFollowup());
+        remarkVo.setExtra(remarksVo.getExtra());
+        if (StringUtils.isNotBlank(remarksVo.getConsult())) {
             if (remarkVo.getConsult().contains(",")) {
                 List<String> cons = Arrays.asList(remarkVo.getConsult().split(","));
                 String Cons = "";
@@ -715,7 +736,6 @@ public class ClubServiceImpl implements ClubService {
 
     @Override
     public ResponseJson<PaginationVo<VisitorRemarkVo>> getVisitorList(Integer serviceProviderId,
-//                                                                      String keyWord,
 //                                                                      String startAddTime,
 //                                                                      String endAddTime,
 //                                                                      String consult,
@@ -779,6 +799,13 @@ public class ClubServiceImpl implements ClubService {
             Integer serviceProviderId = jsonObject.getInteger("serviceProviderId");
             String remarks = jsonObject.getString("remarks");
             String consult = jsonObject.getString("consult");
+
+            String clubType = jsonObject.getString("clubType");
+            String pinceSensitve = jsonObject.getString("pinceSensitve");
+            String satisfied = jsonObject.getString("satisfied");
+            String followup = jsonObject.getString("followup");
+            String extra = jsonObject.getString("extra");
+
             if (null == questionManId) {
                 return ResponseJson.error("参数异常，咨询人id不能为空");
             }
@@ -794,6 +821,12 @@ public class ClubServiceImpl implements ClubService {
             visitorRemarkVo.setRemarks(remarks);
             visitorRemarkVo.setConsult(consult);
             visitorRemarkVo.setQuestionMan(clubMapper.findQuestionMan(questionManId));
+
+            visitorRemarkVo.setClubType(clubType);
+            visitorRemarkVo.setPinceSensitve(pinceSensitve);
+            visitorRemarkVo.setSatisfied(satisfied);
+            visitorRemarkVo.setFollowup(followup);
+            visitorRemarkVo.setExtra(extra);
             if (newRemarks) {
                 // 新增备注
                 clubMapper.insertVisitorRemark(visitorRemarkVo);
@@ -858,6 +891,12 @@ public class ClubServiceImpl implements ClubService {
         visit.setAddDate(visitRemarksVo.getAddDate());
         visit.setImageList(imageList);
         visit.setFileList(fileList);
+        visit.setClubType(visitRemarksVo.getClubType());
+        visit.setFollowup(visitRemarksVo.getFollowup());
+        visit.setSatisfied(visitRemarksVo.getSatisfied());
+        visit.setPinceSensitve(visitRemarksVo.getPinceSensitve());
+        visit.setExtra(visitRemarksVo.getExtra());
+
         if (StringUtils.isNotBlank(visitRemarksVo.getConsult())) {
             if (visitRemarksVo.getConsult().contains(",")) {
                 List<String> cons = Arrays.asList(visitRemarksVo.getConsult().split(","));
@@ -875,13 +914,13 @@ public class ClubServiceImpl implements ClubService {
     }
 
     @Override
-    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, String pinceSensitve, String satisfied, String followup, String extra, int pageNum, int pageSize) {
         PageInfo<VisitorRemarkVo> remarksList = null;
         List<String> conss = new ArrayList<>();
-        if(StringUtils.isNotBlank(consult)){
-            if(consult.contains(",")){
+        if (StringUtils.isNotBlank(consult)) {
+            if (consult.contains(",")) {
                 conss = Arrays.asList(consult.split(","));
-            }else{
+            } else {
                 conss.add(consult);
             }
         }
@@ -889,13 +928,13 @@ public class ClubServiceImpl implements ClubService {
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             List<String> finalConss = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, finalConss));
-        } else  if (null != findLeader && findLeader > 0) {
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss));
+        } else if (null != findLeader && findLeader > 0) {
             List<String> finalConss1 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, finalConss1));
-        }else {
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1));
+        } else {
             List<String> finalConss2 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() ->clubMapper.getVisitorListByKey(serviceProviderId, keyWord,startAddTime, endAddTime, finalConss2));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitorListByKey(serviceProviderId, keyWord, startAddTime, endAddTime, finalConss2));
         }
         ArrayList<VisitRemarkVo> remarkVos = new ArrayList<>();
         remarksList.getList().forEach(r -> {
@@ -921,9 +960,9 @@ public class ClubServiceImpl implements ClubService {
                     visit.setConsultBack(clubMapper.findConsultById(r.getConsult()).getClassName());
                 }
             }
-            if(StringUtils.isBlank(r.getQuestionMan())){
+            if (StringUtils.isBlank(r.getQuestionMan())) {
                 visit.setQuestionMan(clubMapper.findQuestionMan(r.getQuestionManId()));
-            }else{
+            } else {
                 visit.setQuestionMan(r.getQuestionMan());
             }
             visit.setLeaderName(r.getLeaderName());
@@ -1036,4 +1075,13 @@ public class ClubServiceImpl implements ClubService {
         List<TeamGroupVo> groups = clubMapper.findGroups(leaderId);
         return ResponseJson.success(groups);
     }
+
+    @Override
+    public ResponseJson getCmRemarksList(String remarks) {
+        if (null == remarks) {
+            return ResponseJson.error("参数异常，关键词不能为空!", null);
+        }
+        List<CmRemarksVo> remarklist = clubMapper.getCmRemarksList(remarks);
+        return ResponseJson.success(remarklist);
+    }
 }

src/main/java/com/caimei365/user/service/impl/HeHeServiceImpl.java

@@ -109,7 +109,7 @@ public class HeHeServiceImpl implements HeHeService {
                     newUserCouponIds.forEach(couponId->{
                         // 查询优惠券金额
                         Double couponAmount = heHeMapper.getCouponAmount(couponId);
-                        String content = "恭喜您成功注册登录。现赠送" + couponAmount + "元优惠券到您的领券中心，请赶紧登录呵呵商城小程序领取下单吧。退订回T";
+                        String content = "恭喜您成功注册登录。现赠送" + couponAmount + "元优惠券到您的领券中心，请赶紧登录颜选美学小程序领取下单吧。退订回T";
                         boolean result = remoteCallService.remoteSendSms(17, 3, heHeUserDto.getMobile(), content);
                         log.info("【呵呵新人券派送】mobile:" + heHeUserDto.getMobile() + ",result:" + result);
                     });
@@ -129,7 +129,7 @@ public class HeHeServiceImpl implements HeHeService {
                             String mobile = heHeMapper.findUserMobile(shareUserId);
                             // 查询优惠券金额
                             Double couponAmount = heHeMapper.getCouponAmount(couponId);
-                            String content = "恭喜您成功邀请一位好友注册登录，现赠送"+couponAmount+"元优惠券到您的领券中心，请赶紧登录呵呵商城小程序领取下单吧。退订回T";
+                            String content = "恭喜您成功邀请一位好友注册登录，现赠送"+couponAmount+"元优惠券到您的领券中心，请赶紧登录颜选美学小程序领取下单吧。退订回T";
                             boolean result = remoteCallService.remoteSendSms(18, 3, mobile, content);
                             log.info("【呵呵好友邀请券派送】mobile:" + mobile + ",result:" + result);
                         });
@@ -144,7 +144,7 @@ public class HeHeServiceImpl implements HeHeService {
     @Override
     public ResponseJson<String> sendVerificationCode(String mobile) {
         String randomCode = CodeUtil.generateCodeInt(6);
-        String content = "您“呵呵商城”小程序的验证码为："+randomCode+"，验证码 5 分钟内有效。";
+        String content = "您“颜选美学”小程序的验证码为："+randomCode+"，验证码 5 分钟内有效。";
         boolean smsFlag = remoteCallService.remoteSendSms(0, 1, mobile, content);
         if (!smsFlag) {
             // 短信发送失败重试一次

src/main/resources/mapper/ClubMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.caimei365.user.mapper.ClubMapper">
     <insert id="insertRemarks" parameterType="com.caimei365.user.model.po.ClubRemarksPo" keyProperty="remarksId"
             useGeneratedKeys="true">
-        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan,consultType)
-        values (#{clubId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan},#{consult})
+        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan,consultType,clubType,pinceSensitve,satisfied,followup,extra)
+        values (#{clubId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan},#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra})
     </insert>
     <insert id="insertRemarksImage">
         insert into cm_club_remarks_file(remarksId, fileType, imageUrl)
@@ -19,8 +19,8 @@
         values (#{questionManId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan}, #{concactTime})
     </insert>
     <insert id="insertVisitorRemark" keyProperty="remarksId" useGeneratedKeys="true">
-        insert into cm_visitor_remarks(questionMan, questionManId, serviceProviderId, remarks, addTime,consultType)
-        values (#{questionMan}, #{questionManId}, #{serviceProviderId}, #{remarks}, now(),#{consult})
+        insert into cm_visitor_remarks(questionMan, questionManId, serviceProviderId, remarks, addTime,consultType,clubType,pinceSensitve,satisfied,followup,extra)
+        values (#{questionMan}, #{questionManId}, #{serviceProviderId}, #{remarks}, now(),#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra})
     </insert>
     <insert id="insertVisitorRemarksImage">
         insert into cm_visitor_remarks_file(remarksId, fileType, imageUrl)
@@ -283,7 +283,7 @@
         order by addTime desc
     </select>
     <select id="getRemarks" resultType="com.caimei365.user.model.vo.RemarksVo">
-        select ccr.id as remarksId, ccr.remarks, ccr.questionMan, ccr.addTime, ccr.clubId, c.userID,IFNULL(ccr.consultType,'')as consult
+        select ccr.id as remarksId, ccr.remarks, ccr.questionMan, ccr.addTime, ccr.clubId, c.userID,IFNULL(ccr.consultType,'')as consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra
         from cm_club_remarks ccr
                  left join club c on ccr.clubId = c.clubId
         where id = #{remarksId}
@@ -373,11 +373,11 @@
         ORDER BY addTime DESC
     </select>
     <select id="getVisitRemark" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        select id as remarksId, questionManId, remarks, questionMan, addTime as addDate,IFNULL(consultType,'') as consult
+        select id as remarksId, questionManId, remarks, questionMan, addTime as addDate,IFNULL(consultType,'') as consult,clubType,pinceSensitve,satisfied,followup,extra
         from cm_visitor_remarks
         where id = #{remarksId}
-          AND remarks IS NOT NULL
-          and clubId is null
+#           AND remarks IS NOT NULL
+#           and clubId is null
     </select>
     <select id="getVisitRemarksImageList" resultType="java.lang.String">
         select imageUrl
@@ -427,6 +427,7 @@
     <select id="getRemarksListByKey" resultType="com.caimei365.user.model.vo.RemarksVo">
         select DISTINCT
                ccr.id as remarksId, ccr.remarks, ccr.addTime, ccr.questionMan, ccr.clubId,c.Name as clubName,ccr.serviceProviderId,
+        ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,ifnull(ccr.consultType,'') as consult
         from cm_club_remarks ccr
         LEFT JOIN club c ON c.clubID = ccr.clubId
@@ -436,12 +437,29 @@
            OR c.name LIKE CONCAT('%', #{keyWord}, '%')
            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
         </if>
-        <if test="startAddTime !=''">
+<!--        <if test="leaderId != null and leaderId>0">-->
+<!--            and csr.leaderId = #{leaderId}-->
+<!--        </if>-->
+<!--        <if test="groupId != null and groupId>0">-->
+<!--            and ccr.serviceProviderId = #{groupId}-->
+<!--        </if>-->
+        <if test="startAddTime !='' and startAddTime !=null">
             and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
         </if>
-        <if test="endAddTime != ''">
+        <if test="endAddTime != '' and endAddTime!=null">
             and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
         </if>
+
+        <if test="pinceSensitve != '' and pinceSensitve!=null">
+            and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
+        </if>
+<!--        <if test="satisfied != '' and satisfied!=null">-->
+<!--            and ccr.satisfied LIKE concat('%',#{satisfied},'%')-->
+<!--        </if>-->
+
+<!--        <if test="followup != '' and !=null">-->
+<!--            and ccr.followup LIKE concat('%',#{followup},'%')-->
+<!--        </if>-->
         <if test="con != null and con.size > 0">
            and
               <foreach collection="con" item="item" index="index"  open="(" close=")" separator="OR">
@@ -532,6 +550,7 @@
         SELECT DISTINCT
                ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName
         FROM cm_club_remarks ccr
@@ -543,6 +562,7 @@
             <if test="keyWord != null and keyWord !=''">
                 AND ccr.remarks LIKE concat('%',#{keyWord},'%')
                 or ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+                or c.Name LIKE CONCAT('%', #{keyWord}, '%')
             </if>
             <if test="leaderId != null and leaderId>0">
                 and csr.leaderId = #{leaderId}
@@ -550,16 +570,28 @@
             <if test="groupId != null and groupId>0">
                 and ccr.serviceProviderId = #{groupId}
             </if>
-            <if test="startAddTime !=''">
+            <if test="startAddTime !='' and startAddTime !=null">
                 and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
             </if>
-            <if test="endAddTime != ''">
+            <if test="endAddTime != '' and endAddTime!=null">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
+
+            <if test="pinceSensitve != '' and pinceSensitve!=null">
+                and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
+            </if>
+            <if test="satisfied != '' and satisfied!=null">
+                and ccr.satisfied LIKE concat('%',#{satisfied},'%')
+            </if>
+
+            <if test="followup != '' and followup !=null">
+                and ccr.followup LIKE concat('%',#{followup},'%')
+            </if>
+
             <if test="con != null and con.size > 0">
                 and
                 <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
-                    ccr.consultType LIKE CONCAT('%',#{item},'%')
+                    ccr.consultType LIKE CONCAT('%',#{consultType},'%')
                 </foreach>
             </if>
         </where>
@@ -568,6 +600,7 @@
     <select id="getAllVisitRemark" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,ccr.addTime as addDate,ccr.questionMan,IFNULL(ccr.consultType,'') as consult,ccr.serviceProviderId,ccr.questionManId,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName
         FROM cm_visitor_remarks ccr
@@ -587,12 +620,22 @@
             <if test="groupId != null and groupId > 0">
                 and ccr.serviceProviderId = #{groupId}
             </if>
-            <if test="startAddTime !=''">
+            <if test="startAddTime !='' and startAddTime !=null">
                 and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
             </if>
-            <if test="endAddTime != ''">
+            <if test="endAddTime != '' and endAddTime!=null">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
+            <if test="pinceSensitve != '' and pinceSensitve!=null">
+                and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
+            </if>
+            <if test="satisfied != '' and satisfied!=null">
+                and ccr.satisfied LIKE concat('%',#{satisfied},'%')
+            </if>
+
+            <if test="followup != '' and followup !=null">
+                and ccr.followup LIKE concat('%',#{followup},'%')
+            </if>
             <if test="con != null and con.size > 0">
                 and
                 <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
@@ -607,4 +650,9 @@
         LEFT JOIN serviceprovider s ON s.serviceProviderId=csr.leaderId
         WHERE s.serviceProviderID = #{serviceProviderId}
     </select>
+    <select id="getCmRemarksList" resultType="com.caimei365.user.model.vo.CmRemarksVo">
+        SELECT remarks FROM cm_remarks csr
+        WHERE remarks like concat('%',#{remarks},'%')
+        order by addtime DESC
+    </select>
 </mapper>