review修改代码

src/main/java/cn/quantgroup/customer/service/impl/KaServiceImpl.java

@@ -180,7 +180,7 @@ public class KaServiceImpl implements IKaService {
 
             param.put("isSucc", isSucc);
 
-            String result = null;
+            String result;
             try {
                 result = httpService.get(url, param);
             } catch (Exception e) {

src/main/java/cn/quantgroup/customer/service/impl/OrderServiceImpl.java

 package cn.quantgroup.customer.service.impl;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
-import cn.quantgroup.customer.enums.OrderStatusEnums;
 import cn.quantgroup.customer.model.Tuple;
 import cn.quantgroup.customer.model.kaordermapping.ApplyRequestHistory;
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
@@ -13,7 +12,6 @@ import cn.quantgroup.customer.service.IOrderService;
 import cn.quantgroup.customer.service.IXyqbService;
 import cn.quantgroup.customer.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -116,20 +114,20 @@ public class OrderServiceImpl implements IOrderService {
         JsonResult<LoanOrderMapping> orderMappingResult = kaService.findOrderMapping(orderQuery);
         LoanOrderMapping loanOrderMapping;
         if (!orderMappingResult.isSuccess()) {
-            log.error("{} 查询订单信息orderMapping失败 result={} orderQuery={}", logPre, orderMappingResult, orderQuery);
-            return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
+            log.warn("{} 查询订单信息orderMapping失败 result={} orderQuery={}", logPre, orderMappingResult, orderQuery);
+            return JsonResult.buildErrorStateResult(orderMappingResult.getMsg(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
         loanOrderMapping = orderMappingResult.getData();
-        // 可能是进件失败，此时需要根据渠道订单号和渠道号查询进件request表
         if (Objects.nonNull(loanOrderMapping)) {
             return buildHasOrderMapping(orderQuery, loanOrderMapping);
         } else {
-            if (Objects.isNull(orderQuery.getChannelId()) || StringUtils.isBlank(orderQuery.getChannelOrderNo())) {
-                log.error("{} orderMapping为空，且渠道号和渠道订单号为空 result={} orderQuery={}", logPre, orderMappingResult, orderQuery);
-                return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
-            } else {
+            // 可能两种结果 1)进件失败 此时需要根据渠道订单号和渠道号查询进件流水  2)不存在该订单
+            if (StringUtils.isNotBlank(orderQuery.getChannelOrderNo()) && Objects.nonNull(orderQuery.getChannelId())) {
                 return buildNoOrderMapping(orderQuery.getChannelOrderNo(), orderQuery.getChannelId());
+            } else {
+                // 不存在订单信息
+                return JsonResult.buildSuccessResult("订单不存在", null);
             }
         }
     }
@@ -143,12 +141,17 @@ public class OrderServiceImpl implements IOrderService {
      */
     private JsonResult buildNoOrderMapping(String channelOrderNo, Long channelId) {
         String logPre = "OrderServiceImpl.buildNoOrderMapping";
-        // 查询订单信息  查询ka
+        // 查询进件流水信息  查询ka
         JsonResult<ApplyRequestHistory> orderMappingResult = kaService.queryLatestChannelRequestFlows(channelOrderNo, channelId);
-        ApplyRequestHistory applyRequestHistory;
-        if (!orderMappingResult.isSuccess() || Objects.isNull(applyRequestHistory = orderMappingResult.getData())) {
-            log.error("{} 最新渠道进件请求流水失败，不存在进件流水信息 result={} channelOrderNo={},channelId={}", logPre, orderMappingResult, channelOrderNo, channelId);
-            return JsonResult.buildErrorStateResult("不存在进件流水信息", ErrorCodeEnum.RETURN_ERROR.getCode());
+        if (!orderMappingResult.isSuccess()) {
+            log.error("{} 查询渠道进件流水信息异常 result={} channelOrderNo={},channelId={}", logPre, orderMappingResult, channelOrderNo, channelId);
+            return JsonResult.buildErrorStateResult("查询渠道进件流水信息异常", ErrorCodeEnum.RETURN_ERROR.getCode());
+        }
+
+        ApplyRequestHistory applyRequestHistory = orderMappingResult.getData();
+        // 不存在进件流水信息 返回查询不到该笔订单
+        if (Objects.isNull(applyRequestHistory)) {
+            return JsonResult.buildSuccessResult("订单不存在", null);
         }
 
         // 存在进件流水，进件失败
@@ -220,33 +223,17 @@ public class OrderServiceImpl implements IOrderService {
     private Tuple<Boolean, String> validate(OrderQueryParam orderQuery) {
         Tuple<Boolean, String> result = new Tuple<>();
         result.setKey(false);
-        int orderParam = 0;
         if (Objects.isNull(orderQuery)) {
             result.setValue("请求参数为空");
             return result;
         }
-        if (StringUtils.isNotBlank(orderQuery.getChannelOrderNo())) {
-            if (Objects.isNull(orderQuery.getChannelId())) {
-                result.setValue("查询参数渠道订单号和渠道号要同时存在");
-                return result;
-            }
-            orderParam++;
-        }
-
-        if (StringUtils.isNotBlank(orderQuery.getApplyOrderNo())) {
-            orderParam++;
-        }
 
-        if (Objects.nonNull(orderQuery.getLoanId())) {
-            orderParam++;
-        }
-
-        if (orderParam == 0) {
+        if (StringUtils.isBlank(orderQuery.getApplyOrderNo())
+                && StringUtils.isBlank(orderQuery.getApplyOrderNo())
+                && Objects.isNull(orderQuery.getLoanId())
+                && Objects.isNull(orderQuery.getChannelId())) {
             result.setValue("请求参数为空");
             return result;
-        } else if (orderParam > 1) {
-            result.setValue("只能使用渠道号和渠道订单号组合查询");
-            return result;
         }
 
         result.setKey(true);
@@ -274,7 +261,7 @@ public class OrderServiceImpl implements IOrderService {
         JsonResult<List<CallbackRecord>> sendFailRecordResult = kaService.querySendRecords(applyNo, channelId, Boolean.FALSE);
         if (!sendFailRecordResult.isSuccess()) {
             log.error("{} 查询发送失败记录失败 orderQuery :{},sendFailRecordResult：{}", logPre, orderQuery, sendFailRecordResult);
-            return sendSuccRecordResult;
+            return sendFailRecordResult;
         }
         //聚合信息
         List<CallbackRecord> callbackRecords = doMergeLists(sendSuccRecordResult.getData(), sendFailRecordResult.getData());