Merge branch 'developer' into 'master'

Developer

See merge request !4

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

@@ -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;
     }
@@ -291,4 +275,20 @@ public class TabEvaluateOrderConfig {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    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;
+    }
 }
\ No newline at end of file

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/EvaluateOutApiServiceImpl.java

@@ -88,8 +88,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
         List<OrderGoodsDTO> dtoList = EntityUtil.changeEntityListByJSON(OrderGoodsDTO.class, orderListDetailDTO.getOrderItemList());
         evaluateDTO.setGoodsInfo(JSON.toJSONString(dtoList));
-        StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(evaluateDTO.getEnterpriseId(), Integer.valueOf(orderListDetailDTO.getOrderDTO().getStoreIdOffline())).getResult();
 
+        StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(evaluateDTO.getEnterpriseId(), Integer.valueOf(orderListDetailDTO.getOrderDTO().getStoreIdOffline())).getResult();
         evaluateDTO.setStoreId(storeDTO.getStoreId());
         evaluateDTO.setStoreInfoId(storeDTO.getStoreInfoId());
         evaluateDTO.setStoreName(storeDTO.getStoreName());
@@ -97,6 +97,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         evaluateDTO.setStoreGroupId(storeDTO.getStoreGroupId());
         evaluateDTO.setStoreGroupName(storeDTO.getStoreGroupName());
         evaluateDTO.setAreaName(storeDTO.getProvinces());
+
         evaluateDTO.setOrderNumber(orderListDetailDTO.getOrderDTO().getOrderNo());
         evaluateDTO.setReceiptsDate(orderListDetailDTO.getOrderDTO().getReceiptsTime());
         evaluateDTO.setOrderMount(orderListDetailDTO.getOrderDTO().getPayAmount());
@@ -252,8 +253,13 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             List<TabEvaluateImg> evaluateImgList = evaluateImgService.listImageByEvaluateId(evaluateDTO.getEvaluateId());
             List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
             evaluateDTO.setImgList(imgList);
+
+            List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
+
+            evaluateDTO.setQuickReplyTagNameList(Optional.ofNullable(tagsList).orElse(Collections.emptyList()).stream().map(TabEvaluateTags::getTagName).collect(Collectors.toList()));
         }
 
+
         return EnterpriseServiceResponse.success(resultPage);
     }
 
@@ -274,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());
     }
 
@@ -347,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 {

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

@@ -19,6 +19,7 @@ import com.gic.evaluate.service.ProblemManageApiService;
 import com.gic.evaluate.service.ProblemReplyService;
 import com.gic.evaluate.service.ProblemService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.curator.shaded.com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,6 +65,8 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
             List<TabProblemImg> tabImgList = problemImgService.listImageByProblemId(problemId);
             List<String> list = Optional.ofNullable(tabImgList).orElse(Collections.emptyList()).stream().map(TabProblemImg::getImgUrl).collect(Collectors.toList());
             problemDTO.setImgList(list);
+        } else {
+            problemDTO.setImgList(Lists.newArrayList(problemDTO.getImageUrl()));
         }
         List<ProblemReplyDTO> replyList = problemReplyService.listReply(problemId);