门店

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/OrderStatusQO.java

+package com.gic.evaluate.qo;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2020/2/6 9:36
+ */
+public class OrderStatusQO implements Serializable {
+
+    private static final long serialVersionUID = 4919895618830625309L;
+
+    private Long orderId;
+    private Long memberId;
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.evaluate.dto.EvaluateDTO;
 import com.gic.evaluate.dto.MemberReplyDTO;
 import com.gic.evaluate.qo.EvaluateOutQO;
+import com.gic.evaluate.qo.OrderStatusQO;
 
 import java.util.List;
 import java.util.Map;
@@ -80,7 +81,7 @@ public interface EvaluateOutApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.Long,java.lang.Integer>>
      * @throws
      */
-    ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<Long> orderIdList, Long memberId);
+    ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList);
 
     /**
      * 用户隐藏追评

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

@@ -14,6 +14,7 @@ import com.gic.evaluate.dto.EvaluateReplyDTO;
 import com.gic.evaluate.dto.MemberReplyDTO;
 import com.gic.evaluate.entity.*;
 import com.gic.evaluate.qo.EvaluateOutQO;
+import com.gic.evaluate.qo.OrderStatusQO;
 import com.gic.evaluate.service.*;
 import com.gic.member.api.dto.AcuDetailDTO;
 import com.gic.member.api.dto.MemberUserDTO;
@@ -279,40 +280,40 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     }
 
     @Override
-    public ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<Long> orderIdList, Long memberId) {
+    public ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList) {
         Map<Long, Integer> resultMap = new HashMap<>();
         TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
 
 
-        for (Long orderId : orderIdList) {
-            TabEvaluate evaluate = this.evaluateService.getEvaluateByOrderId(enterpriseId, orderId);
+        for (OrderStatusQO statusQO : orderIdList) {
+            TabEvaluate evaluate = this.evaluateService.getEvaluateByOrderId(enterpriseId, statusQO.getOrderId());
 
-            OrderListDetailDTO orderListDetailDTO = orderApiService.getOrderDetail(enterpriseId, orderId, memberId).getResult();
+            OrderListDetailDTO orderListDetailDTO = orderApiService.getOrderDetail(enterpriseId, statusQO.getOrderId(), statusQO.getOrderId()).getResult();
             // 判断是否超过评价时间
             if (overLimitTime(evaluateOrderConfig, orderListDetailDTO.getOrderDTO().getReceiptsTime())) {
                 // 超过评价时间
-                resultMap.put(orderId, OrderReplyEnum.EVALUATE_OVERDUE.getCode());
+                resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_OVERDUE.getCode());
             } else {
                 // 没有超过评价时间
                 if (evaluate != null) {
                     // 已经评价过
                     if (Constants.CLOSE.equals(evaluateOrderConfig.getReview())) {
                         // 判断追评是否支持
-                        resultMap.put(orderId, OrderReplyEnum.REPLY_NOT_SUPPORT.getCode());
+                        resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_NOT_SUPPORT.getCode());
                     } else {
                         // 是否追评超过次数
                         List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId());
                         if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() <= replyList.size()) {
                             // 追评超过次数
-                            resultMap.put(orderId, OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
+                            resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
                         } else {
                             //追评没有超过次数
-                            resultMap.put(orderId, evaluate.getReplyStatus());
+                            resultMap.put(statusQO.getOrderId(), evaluate.getReplyStatus());
                         }
                     }
                 } else {
                     //还没有评价过
-                    resultMap.put(orderId, -1);
+                    resultMap.put(statusQO.getOrderId(), -1);
                 }
             }
         }