客户咨询记录

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

@@ -170,9 +170,9 @@ public class ClubApi {
                                                                Integer leaderId,
                                                                Integer manager,
                                                                String clubType,
-                                                               String pinceSensitve,
-                                                               String satisfied,
-                                                               String followup,
+                                                               Integer pinceSensitve,
+                                                               Integer satisfied,
+                                                               Integer followup,
                                                                String extra,
                                                                Integer groupId,
                                                                @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@@ -355,9 +355,9 @@ public class ClubApi {
                                                                           Integer groupId,
                                                                           Integer manager,
                                                                           String clubType,
-                                                                          String pinceSensitve,
-                                                                          String satisfied,
-                                                                          String followup,
+                                                                          Integer pinceSensitve,
+                                                                          Integer satisfied,
+                                                                          Integer followup,
                                                                           String extra,
                                                                           @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                           @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {

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("pinceSensitve") String pinceSensitve, @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") Integer 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,9 @@ 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("followup") String followup,@Param("satisfied") String satisfied,@Param("pinceSensitve") String pinceSensitve, @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") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer 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("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("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con);
 
     Integer findLeaderId(Integer serviceProviderId);
 

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

@@ -49,15 +49,15 @@ public class ClubRemarksPo implements Serializable {
     /**
      * 价格敏感度
      */
-    private String pinceSensitve;
+    private Integer pinceSensitve;
     /**
      * 意向程度
      */
-    private String satisfied;
+    private Integer satisfied;
     /**
      * 跟进状态
      */
-    private String followup;
+    private Integer followup;
     /**
      * 额外说明
      */

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

@@ -75,15 +75,15 @@ public class RemarkVo implements Serializable {
     /**
      * 价格敏感度
      */
-    private String pinceSensitve;
+    private Integer pinceSensitve;
     /**
      * 意向程度
      */
-    private String satisfied;
+    private Integer satisfied;
     /**
      * 跟进状态
      */
-    private String followup;
+    private Integer followup;
     /**
      * 额外说明
      */

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

@@ -79,15 +79,15 @@ public class RemarksVo implements Serializable {
     /**
      * 价格敏感度
      */
-    private String pinceSensitve;
+    private Integer pinceSensitve;
     /**
      * 意向程度
      */
-    private String satisfied;
+    private Integer satisfied;
     /**
      * 跟进状态
      */
-    private String followup;
+    private Integer followup;
     /**
      * 额外说明
      */

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

@@ -72,15 +72,15 @@ public class VisitRemarkVo  implements Serializable {
     /**
      * 价格敏感度
      */
-    private String pinceSensitve;
+    private Integer pinceSensitve;
     /**
      * 意向程度
      */
-    private String satisfied;
+    private Integer satisfied;
     /**
      * 跟进状态
      */
-    private String followup;
+    private Integer followup;
     /**
      * 额外说明
      */

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

@@ -80,15 +80,15 @@ public class VisitorRemarkVo implements Serializable {
     /**
      * 价格敏感度
      */
-    private String pinceSensitve;
+    private Integer pinceSensitve;
     /**
      * 意向程度
      */
-    private String satisfied;
+    private Integer satisfied;
     /**
      * 跟进状态
      */
-    private String followup;
+    private Integer followup;
     /**
      * 额外说明
      */

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

@@ -124,9 +124,9 @@ public interface ClubService {
                                                         Integer leaderId,
                                                         Integer manager,
                                                         String clubType,
-                                                        String pinceSensitve,
-                                                        String satisfied,
-                                                        String followup,
+                                                        Integer pinceSensitve,
+                                                        Integer satisfied,
+                                                        Integer followup,
                                                         String extra,
                                                         Integer groupId, int pageNum, int pageSize);
 
@@ -202,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, String clubType, String pinceSensitve,String satisfied,String followup, String extra, 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, Integer pinceSensitve,Integer satisfied,Integer followup, String extra, int pageNum, int pageSize);
 
     ResponseJson deleteVisitRemarks(String remarksId);
 

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

@@ -381,14 +381,14 @@ public class ClubServiceImpl implements ClubService {
             Integer clubId = jsonObject.getInteger("clubId");
             Integer remarksId = jsonObject.getInteger("remarksId");
             Integer serviceProviderId = jsonObject.getInteger("serviceProviderId");
-            String remarks = jsonObject.getString("remarks");
+         //   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");
+            Integer pinceSensitve = jsonObject.getInteger("pinceSensitve");
+            Integer satisfied = jsonObject.getInteger("satisfied");
+            Integer followup = jsonObject.getInteger("followup");
             String extra = jsonObject.getString("extra");
             if (null == clubId) {
                 return ResponseJson.error("参数异常，机构id不能为空");
@@ -396,13 +396,36 @@ public class ClubServiceImpl implements ClubService {
             if (null == serviceProviderId) {
                 return ResponseJson.error("参数异常，协销id不能为空");
             }
-            // 是否新增备注
+            JSONArray logistics;
+            try {
+                logistics = parseArray(jsonParamsDto.getParams());
+            } catch (Exception e) {
+                log.error("【添加备注】>>>参数解析异常try-catch:", e);
+                return ResponseJson.error("添加关键词解析异常！", null);
+            }
+            if (logistics.isEmpty()) {
+                return ResponseJson.error("添加关键词异常！", null);
+            }
             boolean newRemarks = null == remarksId;
             ClubRemarksPo clubRemarksPo = new ClubRemarksPo();
+            for (Object logisticObj: logistics) {
+                JSONObject logistic = (JSONObject) logisticObj;
+                String remarkss = (String) logistic.get("remarks");
+                List<String> strings = new ArrayList<>();
+                String rk = null == remarkss ? "" : remarkss;
+                if (!rk.contains("，")) {
+                    String[] split = rk.split("，");
+                    strings = Arrays.asList(split);
+                } else {
+                    strings.add(rk);
+                }
+                if(strings==null){ return ResponseJson.error("添加关键词为空！", null);}
+                clubRemarksPo.setRemarks(strings.toString());
+            }
+            // 是否新增备注
             clubRemarksPo.setRemarksId(remarksId);
             clubRemarksPo.setClubId(clubId);
             clubRemarksPo.setServiceProviderId(serviceProviderId);
-            clubRemarksPo.setRemarks(remarks);
             clubRemarksPo.setQuestionMan(questionMan);
             clubRemarksPo.setConsult(consult);
 
@@ -458,9 +481,9 @@ public class ClubServiceImpl implements ClubService {
                                                                Integer leaderId,
                                                                Integer manager,
                                                                String clubType,
-                                                               String pinceSensitve,
-                                                               String satisfied,
-                                                               String followup,
+                                                               Integer pinceSensitve,
+                                                               Integer satisfied,
+                                                               Integer followup,
                                                                String extra,
                                                                Integer groupId,
                                                                int pageNum, int pageSize) {
@@ -797,13 +820,13 @@ public class ClubServiceImpl implements ClubService {
             String questionManId = jsonObject.getString("questionManId");
             Integer remarksId = jsonObject.getInteger("remarksId");
             Integer serviceProviderId = jsonObject.getInteger("serviceProviderId");
-            String remarks = jsonObject.getString("remarks");
+          //  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");
+            Integer pinceSensitve = jsonObject.getInteger("pinceSensitve");
+            Integer satisfied = jsonObject.getInteger("satisfied");
+            Integer followup = jsonObject.getInteger("followup");
             String extra = jsonObject.getString("extra");
 
             if (null == questionManId) {
@@ -812,13 +835,38 @@ public class ClubServiceImpl implements ClubService {
             if (null == serviceProviderId) {
                 return ResponseJson.error("参数异常，协销id不能为空");
             }
-            // 是否新增备注
+
+            JSONArray logistics;
+            try {
+                logistics = parseArray(visitor.getParams());
+            } catch (Exception e) {
+                log.error("【添加备注】>>>参数解析异常try-catch:", e);
+                return ResponseJson.error("获取关键词解析异常！", null);
+            }
+            if (logistics.isEmpty()) {
+                return ResponseJson.error("获取关键词异常！", null);
+            }
             boolean newRemarks = null == remarksId;
             VisitorRemarkVo visitorRemarkVo = new VisitorRemarkVo();
+            for (Object logisticObj: logistics) {
+                JSONObject logistic = (JSONObject) logisticObj;
+                String remarkss = (String) logistic.get("remarks");
+                List<String> strings = new ArrayList<>();
+                String rk = null == remarkss ? "" : remarkss;
+                if (!rk.contains("，")) {
+                    String[] split = rk.split("，");
+                    strings = Arrays.asList(split);
+                } else {
+                    strings.add(rk);
+                }
+                if(strings==null){ return ResponseJson.error("添加关键词为空！", null);}
+                visitorRemarkVo.setRemarks(strings.toString());
+            }
+            // 是否新增备注
             visitorRemarkVo.setRemarksId(remarksId);
             visitorRemarkVo.setQuestionManId(questionManId);
             visitorRemarkVo.setServiceProviderId(serviceProviderId);
-            visitorRemarkVo.setRemarks(remarks);
+
             visitorRemarkVo.setConsult(consult);
             visitorRemarkVo.setQuestionMan(clubMapper.findQuestionMan(questionManId));
 
@@ -914,7 +962,7 @@ 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, String clubType, String pinceSensitve, String satisfied, String followup, String extra, 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, Integer pinceSensitve, Integer satisfied, Integer followup, String extra, int pageNum, int pageSize) {
         PageInfo<VisitorRemarkVo> remarksList = null;
         List<String> conss = new ArrayList<>();
         if (StringUtils.isNotBlank(consult)) {