提交接口

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateReplyMapper.java

@@ -57,4 +57,6 @@ public interface TabEvaluateReplyMapper {
     List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("showStatus") Integer showStatus);
 
     void updateReplyShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateReplyId") Integer evaluateReplyId, @Param("showStatus") Integer showStatus);
+
+    Integer countReviewReplyByMember(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateReplyService.java

@@ -13,8 +13,11 @@ import java.util.List;
  * @date 2019-12-27 9:52
  */
 public interface EvaluateReplyService {
+
     List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId, Integer showStatus);
 
+    Integer countReviewReplyByMember(Integer enterpriseId, Integer evaluateId);
+
     Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
 
     Integer saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);

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

@@ -31,6 +31,11 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
     }
 
     @Override
+    public Integer countReviewReplyByMember(Integer enterpriseId, Integer evaluateId) {
+        return tabEvaluateReplyMapper.countReviewReplyByMember(enterpriseId, evaluateId) - 1;
+    }
+
+    @Override
     public Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO) {
         TabEvaluateReply tabEvaluateReply = new TabEvaluateReply();
         tabEvaluateReply.setEnterpriseId(userReplyDTO.getEnterpriseId());

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

@@ -224,7 +224,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         // 是否超过次数
         List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId(), Constants.OPEN);
         if (CollectionUtils.isNotEmpty(replyList)) {
-            if (evaluateOrderConfig.getReviewTimes() + 1 < replyList.size()) {
+            if (evaluateOrderConfig.getReviewTimes() < this.evaluateReplyService.countReviewReplyByMember(memberReplyDTO.getEnterpriseId(), evaluate.getEvaluateId())) {
                 return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已经超过最大追评次数，无法继续追评");
             }
         }
@@ -372,7 +372,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
                         } else {
                             // 是否追评超过次数
                             List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId(), Constants.OPEN);
-                            if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() + 1 < replyList.size()) {
+                            if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() < this.evaluateReplyService.countReviewReplyByMember(enterpriseId, evaluate.getEvaluateId())) {
                                 // 追评超过次数
                                 resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
                             } else {
@@ -382,7 +382,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
                                     if (evaluateOrderConfig.getBadEvaluateTagType() == -1 ||
                                             DateUtil.compareDate(DateUtil.addNumForHour(evaluate.getMaliciousStatusTime(), evaluateOrderConfig.getBadEvaluateTagType()), new Date())) {
                                         // 不能评价
-                                        resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
+                                        resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_HAS_OVERDUE.getCode());
                                     }
                                 } else {
                                     resultMap.put(statusQO.getOrderId(), evaluate.getReplyStatus());

gic-evaluate-service/src/main/resources/mapper/TabEvaluateReplyMapper.xml

@@ -227,4 +227,12 @@
   <update id="updateReplyShowStatus">
     update tab_evaluate_reply set show_status = #{showStatus} where enterprise_id = #{enterpriseId} and evaluate_reply_id = #{evaluateReplyId}
   </update>
+  <select id="countReviewReplyByMember" resultType = "int">
+    select
+    count(*)
+    from tab_evaluate_reply
+    where enterprise_id = #{enterpriseId}
+    and evaluate_id = #{evaluateId}
+    and status = 1
+  </select>
 </mapper>
\ No newline at end of file