提交订单

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

@@ -281,6 +281,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
     @Override
     public ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList) {
+        logger.info("查询订单状态：{}", JSON.toJSONString(orderIdList));
         Map<Long, Integer> resultMap = new HashMap<>();
         TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
 
@@ -288,33 +289,37 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         for (OrderStatusQO statusQO : orderIdList) {
             TabEvaluate evaluate = this.evaluateService.getEvaluateByOrderId(enterpriseId, statusQO.getOrderId());
 
-            OrderListDetailDTO orderListDetailDTO = orderApiService.getOrderDetail(enterpriseId, statusQO.getOrderId(), statusQO.getOrderId()).getResult();
-            // 判断是否超过评价时间
-            if (overLimitTime(evaluateOrderConfig, orderListDetailDTO.getOrderDTO().getReceiptsTime())) {
-                // 超过评价时间
-                resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_OVERDUE.getCode());
-            } else {
-                // 没有超过评价时间
-                if (evaluate != null) {
-                    // 已经评价过
-                    if (Constants.CLOSE.equals(evaluateOrderConfig.getReview())) {
-                        // 判断追评是否支持
-                        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(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
+            OrderListDetailDTO orderListDetailDTO = orderApiService.getOrderDetail(enterpriseId, statusQO.getOrderId(), statusQO.getMemberId()).getResult();
+            if (orderListDetailDTO != null) {
+                // 判断是否超过评价时间
+                if (overLimitTime(evaluateOrderConfig, orderListDetailDTO.getOrderDTO().getReceiptsTime())) {
+                    // 超过评价时间
+                    resultMap.put(statusQO.getOrderId(), OrderReplyEnum.EVALUATE_OVERDUE.getCode());
+                } else {
+                    // 没有超过评价时间
+                    if (evaluate != null) {
+                        // 已经评价过
+                        if (Constants.CLOSE.equals(evaluateOrderConfig.getReview())) {
+                            // 判断追评是否支持
+                            resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_NOT_SUPPORT.getCode());
                         } else {
-                            //追评没有超过次数
-                            resultMap.put(statusQO.getOrderId(), evaluate.getReplyStatus());
+                            // 是否追评超过次数
+                            List<TabEvaluateReply> replyList = this.evaluateReplyService.listEvaluateReply(evaluate.getEnterpriseId(), evaluate.getEvaluateId());
+                            if (CollectionUtils.isNotEmpty(replyList) && evaluateOrderConfig.getReviewTimes() <= replyList.size()) {
+                                // 追评超过次数
+                                resultMap.put(statusQO.getOrderId(), OrderReplyEnum.REPLY_OVER_MAX_TIMES.getCode());
+                            } else {
+                                //追评没有超过次数
+                                resultMap.put(statusQO.getOrderId(), evaluate.getReplyStatus());
+                            }
                         }
+                    } else {
+                        //还没有评价过
+                        resultMap.put(statusQO.getOrderId(), -1);
                     }
-                } else {
-                    //还没有评价过
-                    resultMap.put(statusQO.getOrderId(), -1);
                 }
+            } else {
+                resultMap.put(statusQO.getOrderId(), -1);
             }
         }
         return EnterpriseServiceResponse.success(resultMap);