增加remark字段取值

src/main/java/cn/quantgroup/customer/service/IKaService.java

@@ -30,15 +30,17 @@ public interface IKaService {
 
     /**
      * 查询发送通知记录
-     * @param applyNo  申请单号
+     *
+     * @param applyNo   申请单号
      * @param channelId 渠道号
-     * @param aTrue true 成功 false 失败
+     * @param aTrue     true 成功 false 失败
      * @return
      */
     JsonResult<List<CallbackRecord>> querySendRecords(String applyNo, Long channelId, Boolean aTrue);
 
     /**
      * 查询最新渠道进件请求流水
+     *
      * @param applyNo
      * @param channelId
      * @return

src/main/java/cn/quantgroup/customer/service/IXyqbService.java

@@ -58,6 +58,7 @@ public interface IXyqbService {
 
     /**
      * 订单状态查询
+     *
      * @param orderQuery
      * @return
      */

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

@@ -35,7 +35,7 @@ import java.util.StringJoiner;
 public class KaServiceImpl implements IKaService {
 
 
-    @Value("${qapi.http}")
+    @Value("http://localhost:7037") // http://localhost:7037  ${qapi.http}
     private String kaSysUrl;
 
     @Autowired
@@ -165,7 +165,7 @@ public class KaServiceImpl implements IKaService {
     @Override
     public JsonResult<List<CallbackRecord>> querySendRecords(String applyNo, Long channelId, Boolean isSucc) {
         String logPre = "[KaServiceImpl.querySendRecords] 查询发送通知记录";
-        log.info("{}, applyNo={},channelId={},isSucc={}", logPre, applyNo,channelId,isSucc);
+        log.info("{}, applyNo={},channelId={},isSucc={}", logPre, applyNo, channelId, isSucc);
 
         String url = kaSysUrl + "/external/query/orderCallBack";
         try {
@@ -178,7 +178,7 @@ public class KaServiceImpl implements IKaService {
                 param.put("channelId", String.valueOf(channelId));
             }
 
-            param.put("isSucc",isSucc);
+            param.put("isSucc", isSucc);
 
             String result = null;
             try {
@@ -198,7 +198,7 @@ public class KaServiceImpl implements IKaService {
             JsonResult<List<CallbackRecord>> jsonResult = JSONTools.deserialize(result, typeToken);
             return jsonResult;
         } catch (Exception e) {
-            log.error("{} 网络通讯异常,applyNo={},channelId={},isSucc={},ex:{}", applyNo,channelId,isSucc, ExceptionUtils.getStackTrace(e));
+            log.error("{} 网络通讯异常,applyNo={},channelId={},isSucc={},ex:{}", applyNo, channelId, isSucc, ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
@@ -206,12 +206,12 @@ public class KaServiceImpl implements IKaService {
     @Override
     public JsonResult<ApplyRequestHistory> queryLatestChannelRequestFlows(String applyNo, Long channelId) {
         String logPre = "[KaServiceImpl.queryLatestChannelRequestFlows] 查询最新渠道进件请求流水";
-        log.info("{}, applyNo={},channelId={}", logPre, applyNo,channelId);
+        log.info("{}, applyNo={},channelId={}", logPre, applyNo, channelId);
 
         String url = kaSysUrl + "/external/query/applyRequest";
         try {
             Map<String, Object> param = Maps.newHashMap();
-            if(Objects.isNull(channelId) || StringUtils.isBlank(applyNo)){
+            if (Objects.isNull(channelId) || StringUtils.isBlank(applyNo)) {
                 log.error("{} 查询渠道进件流水，渠道号和渠道订单号不允许为空 applyNo={},channelId={}", logPre, applyNo, channelId);
                 return JsonResult.buildErrorStateResult(ErrorCodeEnum.PARAM_ERROR.getMessage(), ErrorCodeEnum.PARAM_ERROR.getCode());
             }
@@ -237,7 +237,7 @@ public class KaServiceImpl implements IKaService {
             };
             return JSONTools.deserialize(result, typeToken);
         } catch (Exception e) {
-            log.error("{} 网络通讯异常,applyNo={},channelId={},ex:{}", applyNo,channelId, ExceptionUtils.getStackTrace(e));
+            log.error("{} 网络通讯异常,applyNo={},channelId={},ex:{}", applyNo, channelId, ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }

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

@@ -122,20 +122,21 @@ public class OrderServiceImpl implements IOrderService {
 
         loanOrderMapping = orderMappingResult.getData();
         // 可能是进件失败，此时需要根据渠道订单号和渠道号查询进件request表
-        if(Objects.isNull(loanOrderMapping)){
-            if(Objects.isNull(orderQuery.getChannelId()) || StringUtils.isBlank(orderQuery.getChannelOrderNo())){
+        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{
-                return buildNoOrderMapping(orderQuery.getChannelOrderNo(),orderQuery.getChannelId());
+            } else {
+                return buildNoOrderMapping(orderQuery.getChannelOrderNo(), orderQuery.getChannelId());
             }
-        }else{
-            return buildHasOrderMapping(orderQuery,loanOrderMapping);
         }
     }
 
     /**
      * 处理查询不到orderMapping的情况，可能是进件失败，也可能不存在该笔订单
+     *
      * @param channelOrderNo
      * @param channelId
      * @return
@@ -143,14 +144,14 @@ public class OrderServiceImpl implements IOrderService {
     private JsonResult buildNoOrderMapping(String channelOrderNo, Long channelId) {
         String logPre = "OrderServiceImpl.buildNoOrderMapping";
         // 查询订单信息  查询ka
-        JsonResult<ApplyRequestHistory> orderMappingResult = kaService.queryLatestChannelRequestFlows(channelOrderNo,channelId);
+        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);
+            log.error("{} 最新渠道进件请求流水失败，不存在进件流水信息 result={} channelOrderNo={},channelId={}", logPre, orderMappingResult, channelOrderNo, channelId);
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        // 存在进件信息，可能是进件失败
+        // 存在进件流水，进件失败
         final String statusStr = "进件失败";
         OrderInfo orderInfo = OrderInfo.builder()
                 .channelOrderNo(channelOrderNo)
@@ -165,11 +166,11 @@ public class OrderServiceImpl implements IOrderService {
                 .build();
         log.info("{} 查询订单信息,返回信息 orderInfoVo={}", logPre, orderInfoVo);
         return JsonResult.buildSuccessResult("处理成功", orderInfoVo);
-
     }
 
     /**
      * 处理渠道订单表有数据的情形
+     *
      * @param orderQuery
      * @param loanOrderMapping
      * @return
@@ -197,14 +198,15 @@ public class OrderServiceImpl implements IOrderService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        final String statusStr = "进件成功";
+        final String defaultStatusStr = "进件成功";
+        String status = Objects.nonNull(orderStatus) ? orderStatus.getStatus().getValue() : defaultStatusStr;
         OrderInfo orderInfo = OrderInfo.builder()
                 .channelOrderNo(loanOrderMapping.getChannelOrderNo())
                 .applyNo(loanOrderMapping.getApplyNo())
                 .channelId(loanOrderMapping.getRegisteredFrom())
                 .loanId(loanOrderMapping.getLoanId())
-                .status(Objects.nonNull(orderStatus)?orderStatus.getStatus().getValue():statusStr)
-                .remark(statusStr)
+                .status(status)
+                .remark(status)
                 .build();
 
         OrderInfoVo orderInfoVo = OrderInfoVo.builder()

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

@@ -30,7 +30,7 @@ import java.util.Objects;
 @Service("xyqbService")
 public class XyqbServiceImpl implements IXyqbService {
 
-    @Value("${api.http}")
+    @Value("http://api-ka1.liangkebang.net")  //${api.http}
     private String xyqbSysUrl;
 
 
@@ -320,6 +320,7 @@ public class XyqbServiceImpl implements IXyqbService {
 
     /**
      * 查询订单状态
+     *
      * @param orderQuery
      * @return
      */
@@ -332,13 +333,13 @@ public class XyqbServiceImpl implements IXyqbService {
         if (Objects.nonNull(orderQuery.getLoanId())) {
             queryParam.put("loanId", String.valueOf(orderQuery.getLoanId()));
         }
-        log.info("{} 请求参数 orderQuery={},queryParam={}", logPre, orderQuery,queryParam);
+        log.info("{} 请求参数 orderQuery={},queryParam={}", logPre, orderQuery, queryParam);
         Map param = SignUtil.sign(SignUtil.KA_API_KEY, queryParam);
-        Map<String,String> header = new HashMap<>(2);
-        header.put("Accept","application/json");
-        header.put("Content-Type","application/x-www-form-urlencoded");
-        String result = httpService.post(url, header,param);
-        log.info("{} 返回结果 result：{}",logPre,result);
+        Map<String, String> header = new HashMap<>(2);
+        header.put("Accept", "application/json");
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        String result = httpService.post(url, header, param);
+        log.info("{} 返回结果 result：{}", logPre, result);
         if (StringUtils.isBlank(result)) {
             log.error("{} 处理失败 queryParam={} result={}", logPre, queryParam, result);
             return JsonResult.buildErrorStateResult("查询订单状态失败，返回为空", ErrorCodeEnum.RETURN_ERROR);
@@ -349,7 +350,7 @@ public class XyqbServiceImpl implements IXyqbService {
             if (Objects.isNull(jsonResult) || Objects.isNull(jsonResult.getData())) {
                 return JsonResult.buildErrorStateResult("查询订单状态失败，反序列化失败", ErrorCodeEnum.RETURN_ERROR);
             } else {
-                return JsonResult.buildSuccessResult("查询订单状态成功",jsonResult.getData().getCurrentStatus());
+                return JsonResult.buildSuccessResult("查询订单状态成功", jsonResult.getData().getCurrentStatus());
             }
         }
     }