评价去掉追评时间

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java

@@ -81,12 +81,12 @@ public class EvaluateOrderConfigDTO implements Serializable {
     /**
      * 追评提醒 X天
      */
-    private Integer reviewRemind;
+//    private Integer reviewRemind;
 
     /**
      * 追评期限
      */
-    private Integer reviewLimitday;
+//    private Integer reviewLimitday;
 
     /**
      * 是否支持用户隐藏追评
@@ -247,14 +247,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
         this.review = review;
     }
 
-    public Integer getReviewLimitday() {
-        return reviewLimitday;
-    }
-
-    public void setReviewLimitday(Integer reviewLimitday) {
-        this.reviewLimitday = reviewLimitday;
-    }
-
     public Integer getReviewUserHidden() {
         return reviewUserHidden;
     }
@@ -327,14 +319,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
         this.replyQuick = replyQuick;
     }
 
-    public Integer getReviewRemind() {
-        return reviewRemind;
-    }
-
-    public void setReviewRemind(Integer reviewRemind) {
-        this.reviewRemind = reviewRemind;
-    }
-
     public Integer getShowType() {
         return showType;
     }

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateMsgLogApiService.java

 package com.gic.evaluate.service;
 
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.evaluate.dto.EvaluateMsgLogDTO;
 
 /**
  *
@@ -31,7 +30,7 @@ public interface EvaluateMsgLogApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
-    ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO);
+//    ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO);
 
     /**
      * 定时器方法，遍历所有商户，调用队列方法
@@ -41,7 +40,7 @@ public interface EvaluateMsgLogApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
-    ServiceResponse<Void> timerSendMemberMessage(String param);
+//    ServiceResponse<Void> timerSendMemberMessage(String param);
 
     /**
      * 队列方法 发送模板消息
@@ -52,5 +51,5 @@ public interface EvaluateMsgLogApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
-    ServiceResponse<Void> queueSendMemberMessage(String enterpriseId);
+//    ServiceResponse<Void> queueSendMemberMessage(String enterpriseId);
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateOrderConfig.java

@@ -59,12 +59,12 @@ public class TabEvaluateOrderConfig {
     /**
      * 追评提醒 X天
      */
-    private Integer reviewRemind;
+//    private Integer reviewRemind;
 
     /**
      * 追评期限
      */
-    private Integer reviewLimitday;
+//    private Integer reviewLimitday;
 
     /**
      * 是否支持用户隐藏追评
@@ -196,22 +196,6 @@ public class TabEvaluateOrderConfig {
         this.review = review;
     }
 
-    public Integer getReviewRemind() {
-        return reviewRemind;
-    }
-
-    public void setReviewRemind(Integer reviewRemind) {
-        this.reviewRemind = reviewRemind;
-    }
-
-    public Integer getReviewLimitday() {
-        return reviewLimitday;
-    }
-
-    public void setReviewLimitday(Integer reviewLimitday) {
-        this.reviewLimitday = reviewLimitday;
-    }
-
     public Integer getReviewUserHidden() {
         return reviewUserHidden;
     }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateOrderConfigServiceImpl.java

@@ -35,8 +35,8 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
         evaluateOrderConfig.setEvaluateLimitday(30);
         evaluateOrderConfig.setDefaultContent("默认好评！");
         evaluateOrderConfig.setReview(Constants.OPEN);
-        evaluateOrderConfig.setReviewRemind(10);
-        evaluateOrderConfig.setReviewLimitday(90);
+//        evaluateOrderConfig.setReviewRemind(10);
+//        evaluateOrderConfig.setReviewLimitday(90);
         evaluateOrderConfig.setReviewUserHidden(Constants.OPEN);
         evaluateOrderConfig.setReviewTimes(1);
         evaluateOrderConfig.setCommentModule(1);

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateMsgLogApiServiceImpl.java

@@ -3,15 +3,8 @@ package com.gic.evaluate.service.outer.impl;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.DateUtil;
-import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.GICMQClientUtil;
-import com.gic.enterprise.dto.EnterpriseDTO;
-import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
-import com.gic.evaluate.constant.Constants;
-import com.gic.evaluate.dto.EvaluateMsgLogDTO;
 import com.gic.evaluate.entity.TabEvaluateMsgLog;
-import com.gic.evaluate.entity.TabEvaluateOrderConfig;
 import com.gic.evaluate.service.EvaluateMsgLogApiService;
 import com.gic.evaluate.service.EvaluateMsgLogService;
 import com.gic.evaluate.service.EvaluateOrderConfigService;
@@ -19,14 +12,13 @@ import com.gic.marketing.process.api.dto.notice.MQNoticeSendDTO;
 import com.gic.marketing.process.api.service.notice.NoticeRouterApiService;
 import com.gic.marketing.process.api.utils.NoticeConstant;
 import com.gic.member.api.service.CuDetailService;
-import com.gic.mq.sdk.GicMQClient;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -59,87 +51,86 @@ public class EvaluateMsgLogApiServiceImpl implements EvaluateMsgLogApiService {
         return ServiceResponse.success();
     }
 
-    @Override
-    public ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO) {
-        logger.info("保存评价提醒日志信息：{}", JSON.toJSONString(evaluateMsgLogDTO));
-        TabEvaluateMsgLog oldMsgLog = evaluateMsgLogService.getByOrderId(evaluateMsgLogDTO.getOrderId());
-        if (oldMsgLog != null) {
-            logger.info("该订单已存在, orderId:{}", evaluateMsgLogDTO.getOrderId());
-            return EnterpriseServiceResponse.success();
-        }
-        TabEvaluateMsgLog evaluateMsgLog = EntityUtil.changeEntityByJSON(TabEvaluateMsgLog.class, evaluateMsgLogDTO);
-
-        TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(evaluateMsgLogDTO.getEnterpriseId());
-        Date now = new Date();
-
-        if (evaluateOrderConfig.getMindHour() != null) {
-            // 第一次提醒
-            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(DateUtil.addNumForDay(now, evaluateOrderConfig.getMindHour())) + " 19:00:00");
-            evaluateMsgLog.setFirstSendTime(sendTime);
-            evaluateMsgLog.setFirstStatus(1);
-        }
-        if (evaluateOrderConfig.getRemindDay() != null) {
-            // 第二次提醒
-            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(DateUtil.addNumForDay(now, evaluateOrderConfig.getRemindDay())) + " 19:00:00");
-            evaluateMsgLog.setSecondSendTime(sendTime);
-            evaluateMsgLog.setSecondStatus(1);
-        }
-        if (Constants.OPEN.equals(evaluateOrderConfig.getReview()) && evaluateOrderConfig.getReviewRemind() != null) {
-            // 追评提醒
-            Date date = DateUtil.addNumForDay(DateUtil.addNumForDay(now, evaluateOrderConfig.getEvaluateLimitday()), evaluateOrderConfig.getReviewRemind());
-            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(date) + " 19:00:00");
-            evaluateMsgLog.setReviewSendTime(sendTime);
-            evaluateMsgLog.setReviewStatus(1);
-        }
-        evaluateMsgLogService.save(evaluateMsgLog);
-        return EnterpriseServiceResponse.success();
-    }
-
-    @Override
-    public ServiceResponse<Void> timerSendMemberMessage(String params) {
-        // 查询到所有的企业id
-        List<EnterpriseDTO> enterpriseList = enterpriseApiService.listEnterpriseByName(null).getResult();
-        List<Integer> enterpriseIds = Optional.ofNullable(enterpriseList).orElse(Collections.emptyList()).stream().map(EnterpriseDTO::getEnterpriseId).collect(Collectors.toList());
-        //        List<Integer> enterpriseIds = enterpriseList
-        for (Integer enterpriseId : enterpriseIds) {
-            GicMQClient client = GICMQClientUtil.getClientInstance();
-            try {
-                logger.info("定时发送 企业：{}", enterpriseId.toString());
-                client.sendMessage("queueSendMemberMessage", enterpriseId.toString());
-            } catch (Exception e) {
-                logger.info("发送队列错误", e);
-            }
-            //            sendMessageToMQ("quartzEnterSendMemberMessage", message);
-        }
-        return EnterpriseServiceResponse.success();
-    }
-
-    @Override
-    public ServiceResponse<Void> queueSendMemberMessage(String message) {
-        Integer enterpriseId = Integer.valueOf(message);
-        List<TabEvaluateMsgLog> firstMsgLogs = this.evaluateMsgLogService.listFirstMsgLogs(enterpriseId);
-        for (TabEvaluateMsgLog log : firstMsgLogs) {
-            sendMsg(enterpriseId, log);
-            log.setFirstRealSendTime(new Date());
-            log.setFirstStatus(2);
-            this.evaluateMsgLogService.update(log);
-        }
-        List<TabEvaluateMsgLog> secondMsgLogs = this.evaluateMsgLogService.listSecondMsgLogs(enterpriseId);
-        for (TabEvaluateMsgLog log : secondMsgLogs) {
-            sendMsg(enterpriseId, log);
-            log.setSecondSendTime(new Date());
-            log.setSecondStatus(2);
-            this.evaluateMsgLogService.update(log);
-        }
-        List<TabEvaluateMsgLog> reviewMsgLogs = this.evaluateMsgLogService.listReviewMsgLogs(enterpriseId);
-        for (TabEvaluateMsgLog log : reviewMsgLogs) {
-            sendMsg(enterpriseId, log);
-            log.setReviewSendTime(new Date());
-            log.setReviewStatus(2);
-            this.evaluateMsgLogService.update(log);
-        }
-        return EnterpriseServiceResponse.success();
-    }
+//    @Override
+//    public ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO) {
+//        logger.info("保存评价提醒日志信息：{}", JSON.toJSONString(evaluateMsgLogDTO));
+//        TabEvaluateMsgLog oldMsgLog = evaluateMsgLogService.getByOrderId(evaluateMsgLogDTO.getOrderId());
+//        if (oldMsgLog != null) {
+//            logger.info("该订单已存在, orderId:{}", evaluateMsgLogDTO.getOrderId());
+//            return EnterpriseServiceResponse.success();
+//        }
+//        TabEvaluateMsgLog evaluateMsgLog = EntityUtil.changeEntityByJSON(TabEvaluateMsgLog.class, evaluateMsgLogDTO);
+//
+//        TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(evaluateMsgLogDTO.getEnterpriseId());
+//        Date now = new Date();
+//
+//        if (evaluateOrderConfig.getMindHour() != null) {
+//            // 第一次提醒
+//            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(DateUtil.addNumForDay(now, evaluateOrderConfig.getMindHour())) + " 19:00:00");
+//            evaluateMsgLog.setFirstSendTime(sendTime);
+//            evaluateMsgLog.setFirstStatus(1);
+//        }
+//        if (evaluateOrderConfig.getRemindDay() != null) {
+//            // 第二次提醒
+//            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(DateUtil.addNumForDay(now, evaluateOrderConfig.getRemindDay())) + " 19:00:00");
+//            evaluateMsgLog.setSecondSendTime(sendTime);
+//            evaluateMsgLog.setSecondStatus(1);
+//        }
+//        if (Constants.OPEN.equals(evaluateOrderConfig.getReview()) && evaluateOrderConfig.getReviewRemind() != null) {
+//            // 追评提醒
+//            Date date = DateUtil.addNumForDay(DateUtil.addNumForDay(now, evaluateOrderConfig.getEvaluateLimitday()), evaluateOrderConfig.getReviewRemind());
+//            Date sendTime = DateUtil.stringToDate(DateUtil.dateToString(date) + " 19:00:00");
+//            evaluateMsgLog.setReviewSendTime(sendTime);
+//            evaluateMsgLog.setReviewStatus(1);
+//        }
+//        evaluateMsgLogService.save(evaluateMsgLog);
+//        return EnterpriseServiceResponse.success();
+//    }
+
+//    @Override
+//    public ServiceResponse<Void> timerSendMemberMessage(String params) {
+//         查询到所有的企业id
+//        List<EnterpriseDTO> enterpriseList = enterpriseApiService.listEnterpriseByName(null).getResult();
+//        List<Integer> enterpriseIds = Optional.ofNullable(enterpriseList).orElse(Collections.emptyList()).stream().map(EnterpriseDTO::getEnterpriseId).collect(Collectors.toList());
+//        for (Integer enterpriseId : enterpriseIds) {
+//            GicMQClient client = GICMQClientUtil.getClientInstance();
+//            try {
+//                logger.info("定时发送 企业：{}", enterpriseId.toString());
+//                client.sendMessage("queueSendMemberMessage", enterpriseId.toString());
+//            } catch (Exception e) {
+//                logger.info("发送队列错误", e);
+//            }
+//                        sendMessageToMQ("quartzEnterSendMemberMessage", message);
+//        }
+//        return EnterpriseServiceResponse.success();
+//    }
+//
+//    @Override
+//    public ServiceResponse<Void> queueSendMemberMessage(String message) {
+//        Integer enterpriseId = Integer.valueOf(message);
+//        List<TabEvaluateMsgLog> firstMsgLogs = this.evaluateMsgLogService.listFirstMsgLogs(enterpriseId);
+//        for (TabEvaluateMsgLog log : firstMsgLogs) {
+//            sendMsg(enterpriseId, log);
+//            log.setFirstRealSendTime(new Date());
+//            log.setFirstStatus(2);
+//            this.evaluateMsgLogService.update(log);
+//        }
+//        List<TabEvaluateMsgLog> secondMsgLogs = this.evaluateMsgLogService.listSecondMsgLogs(enterpriseId);
+//        for (TabEvaluateMsgLog log : secondMsgLogs) {
+//            sendMsg(enterpriseId, log);
+//            log.setSecondSendTime(new Date());
+//            log.setSecondStatus(2);
+//            this.evaluateMsgLogService.update(log);
+//        }
+//        List<TabEvaluateMsgLog> reviewMsgLogs = this.evaluateMsgLogService.listReviewMsgLogs(enterpriseId);
+//        for (TabEvaluateMsgLog log : reviewMsgLogs) {
+//            sendMsg(enterpriseId, log);
+//            log.setReviewSendTime(new Date());
+//            log.setReviewStatus(2);
+//            this.evaluateMsgLogService.update(log);
+//        }
+//        return EnterpriseServiceResponse.success();
+//    }
 
     private void sendMsg(Integer enterpriseId, TabEvaluateMsgLog log) {
 

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java

@@ -280,9 +280,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         calendar.setTime(receiptsDate);
         calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getEvaluateLimitday());
 
-        if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) {
-            calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday());
-        }
+//        if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) {
+//            calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday());
+//        }
         return DateUtil.compareDate(new Date(), calendar.getTime());
     }
 
@@ -353,7 +353,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
                         } else {
                             // 是否追评超过次数
                             List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId(), Constants.OPEN);
-                            if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() <= this.evaluateReplyService.countReviewReplyByMember(enterpriseId, evaluate.getEvaluateId())) {
+                            if (CollectionUtils.isNotEmpty(replyList) &&
+                                    evaluateOrderConfig.getReviewTimes() <= this.evaluateReplyService.countReviewReplyByMember(enterpriseId, evaluate.getEvaluateId())) {
                                 // 追评超过次数
                                 resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
                             } else {