Commit e0c1fe1a by zhiwj

评价去掉追评时间

parent facee0a0
...@@ -81,12 +81,12 @@ public class EvaluateOrderConfigDTO implements Serializable { ...@@ -81,12 +81,12 @@ public class EvaluateOrderConfigDTO implements Serializable {
/** /**
* 追评提醒 X天 * 追评提醒 X天
*/ */
private Integer reviewRemind; // private Integer reviewRemind;
/** /**
* 追评期限 * 追评期限
*/ */
private Integer reviewLimitday; // private Integer reviewLimitday;
/** /**
* 是否支持用户隐藏追评 * 是否支持用户隐藏追评
...@@ -247,14 +247,6 @@ public class EvaluateOrderConfigDTO implements Serializable { ...@@ -247,14 +247,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
this.review = review; this.review = review;
} }
public Integer getReviewLimitday() {
return reviewLimitday;
}
public void setReviewLimitday(Integer reviewLimitday) {
this.reviewLimitday = reviewLimitday;
}
public Integer getReviewUserHidden() { public Integer getReviewUserHidden() {
return reviewUserHidden; return reviewUserHidden;
} }
...@@ -327,14 +319,6 @@ public class EvaluateOrderConfigDTO implements Serializable { ...@@ -327,14 +319,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
this.replyQuick = replyQuick; this.replyQuick = replyQuick;
} }
public Integer getReviewRemind() {
return reviewRemind;
}
public void setReviewRemind(Integer reviewRemind) {
this.reviewRemind = reviewRemind;
}
public Integer getShowType() { public Integer getShowType() {
return showType; return showType;
} }
......
package com.gic.evaluate.service; package com.gic.evaluate.service;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.evaluate.dto.EvaluateMsgLogDTO;
/** /**
* *
...@@ -31,7 +30,7 @@ public interface EvaluateMsgLogApiService { ...@@ -31,7 +30,7 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void> * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws * @throws
*/ */
ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO); // ServiceResponse<Void> saveEvaluateMsgLog(EvaluateMsgLogDTO evaluateMsgLogDTO);
/** /**
* 定时器方法,遍历所有商户,调用队列方法 * 定时器方法,遍历所有商户,调用队列方法
...@@ -41,7 +40,7 @@ public interface EvaluateMsgLogApiService { ...@@ -41,7 +40,7 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void> * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws * @throws
*/ */
ServiceResponse<Void> timerSendMemberMessage(String param); // ServiceResponse<Void> timerSendMemberMessage(String param);
/** /**
* 队列方法 发送模板消息 * 队列方法 发送模板消息
...@@ -52,5 +51,5 @@ public interface EvaluateMsgLogApiService { ...@@ -52,5 +51,5 @@ public interface EvaluateMsgLogApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void> * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws * @throws
*/ */
ServiceResponse<Void> queueSendMemberMessage(String enterpriseId); // ServiceResponse<Void> queueSendMemberMessage(String enterpriseId);
} }
...@@ -59,12 +59,12 @@ public class TabEvaluateOrderConfig { ...@@ -59,12 +59,12 @@ public class TabEvaluateOrderConfig {
/** /**
* 追评提醒 X天 * 追评提醒 X天
*/ */
private Integer reviewRemind; // private Integer reviewRemind;
/** /**
* 追评期限 * 追评期限
*/ */
private Integer reviewLimitday; // private Integer reviewLimitday;
/** /**
* 是否支持用户隐藏追评 * 是否支持用户隐藏追评
...@@ -196,22 +196,6 @@ public class TabEvaluateOrderConfig { ...@@ -196,22 +196,6 @@ public class TabEvaluateOrderConfig {
this.review = review; 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() { public Integer getReviewUserHidden() {
return reviewUserHidden; return reviewUserHidden;
} }
......
...@@ -35,8 +35,8 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic ...@@ -35,8 +35,8 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
evaluateOrderConfig.setEvaluateLimitday(30); evaluateOrderConfig.setEvaluateLimitday(30);
evaluateOrderConfig.setDefaultContent("默认好评!"); evaluateOrderConfig.setDefaultContent("默认好评!");
evaluateOrderConfig.setReview(Constants.OPEN); evaluateOrderConfig.setReview(Constants.OPEN);
evaluateOrderConfig.setReviewRemind(10); // evaluateOrderConfig.setReviewRemind(10);
evaluateOrderConfig.setReviewLimitday(90); // evaluateOrderConfig.setReviewLimitday(90);
evaluateOrderConfig.setReviewUserHidden(Constants.OPEN); evaluateOrderConfig.setReviewUserHidden(Constants.OPEN);
evaluateOrderConfig.setReviewTimes(1); evaluateOrderConfig.setReviewTimes(1);
evaluateOrderConfig.setCommentModule(1); evaluateOrderConfig.setCommentModule(1);
......
...@@ -280,9 +280,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService { ...@@ -280,9 +280,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
calendar.setTime(receiptsDate); calendar.setTime(receiptsDate);
calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getEvaluateLimitday()); calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getEvaluateLimitday());
if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) { // if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) {
calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday()); // calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday());
} // }
return DateUtil.compareDate(new Date(), calendar.getTime()); return DateUtil.compareDate(new Date(), calendar.getTime());
} }
...@@ -353,7 +353,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService { ...@@ -353,7 +353,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
} else { } else {
// 是否追评超过次数 // 是否追评超过次数
List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId(), Constants.OPEN); 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()); resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment