综合查询修改

src/main/java/cn/quantgroup/customer/rest/param/ordermapping/OrderMappingQueryParam.java → src/main/java/cn/quantgroup/customer/rest/param/ordermapping/OrderQueryParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
  * @version 2020/3/9
  */
 @Data
-public class OrderMappingQueryParam {
+public class OrderQueryParam {
 
     private Long loanId;
 

src/main/java/cn/quantgroup/customer/rest/param/user/UserQueryParam.java

+package cn.quantgroup.customer.rest.param.user;
+
+import lombok.Data;
+
+/**
+ * 用户查询参数
+ * @author Wang Xiangwei
+ * @version 2020/3/11
+ */
+@Data
+public class UserQueryParam {
+    /**
+     * 注册手机号
+     */
+    private String phoneNo;
+
+    /**
+     * 用户注册身份证号
+     */
+    private String idNo;
+
+    private Long userId;
+
+    private String uuid;
+}

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

 package cn.quantgroup.customer.service;
 
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
-import cn.quantgroup.customer.rest.param.ordermapping.OrderMappingQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Map;
  */
 public interface IKaService {
 
-    JsonResult<LoanOrderMapping> findOrderMapping(OrderMappingQueryParam orderMappingQueryParam);
+    JsonResult<LoanOrderMapping> findOrderMapping(OrderQueryParam orderQueryParam);
 
     /**
      * key 申请订单号 value 渠道订单号

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

 package cn.quantgroup.customer.service;
 
+import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneAudit;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneFeedback;
 import cn.quantgroup.customer.rest.param.phone.ModifyPhoneQuery;
 import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
+import cn.quantgroup.customer.rest.param.user.UserQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
@@ -22,10 +24,12 @@ public interface IUserService extends UserDetailsService {
 
     /**
      * 用户基本信息
-     * @param userCombinationParam
+     * @param userQueryParam
      * @return
      */
-    JsonResult findUserInfo(UserCombinationParam userCombinationParam);
+    JsonResult findUserInfo(UserQueryParam userQueryParam);
+
+    JsonResult findUserInfoByOrderParam(OrderQueryParam orderQueryParam);
 
     JsonResult findUserCombination(UserCombinationParam userCombinationParam);
 

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

@@ -3,7 +3,7 @@ package cn.quantgroup.customer.service.impl;
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.exception.BusinessException;
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
-import cn.quantgroup.customer.rest.param.ordermapping.OrderMappingQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IKaService;
 import cn.quantgroup.customer.service.http.IHttpService;
@@ -39,18 +39,18 @@ public class KaServiceImpl implements IKaService {
     private IHttpService httpService;
 
     @Override
-    public JsonResult<LoanOrderMapping> findOrderMapping(OrderMappingQueryParam orderMappingQueryParam) {
+    public JsonResult<LoanOrderMapping> findOrderMapping(OrderQueryParam orderQueryParam) {
         String logPre = "KaServiceImpl.findOrderMapping";
-        log.info("{},获得orderMapping orderMappingQueryParam={}", logPre, orderMappingQueryParam);
+        log.info("{},获得orderMapping orderQueryParam={}", logPre, orderQueryParam);
 
-        if (Objects.isNull(orderMappingQueryParam)) {
-            log.error("{} 查询参数为空 orderMappingQueryParam={}", logPre, orderMappingQueryParam);
+        if (Objects.isNull(orderQueryParam)) {
+            log.error("{} 查询参数为空 orderQueryParam={}", logPre, orderQueryParam);
             return JsonResult.buildErrorStateResult("查询参数为空", null);
         }
 
-        String applyOrderNo = orderMappingQueryParam.getApplyOrderNo();
-        String channelOrderNo = orderMappingQueryParam.getChannelOrderNo();
-        Long loanId = orderMappingQueryParam.getLoanId();
+        String applyOrderNo = orderQueryParam.getApplyOrderNo();
+        String channelOrderNo = orderQueryParam.getChannelOrderNo();
+        Long loanId = orderQueryParam.getLoanId();
 
 
         String url = kaSysUrl + "/external/get/orderMapping";
@@ -83,7 +83,7 @@ public class KaServiceImpl implements IKaService {
 
 
         } catch (Exception e) {
-            log.error("{} 网络通讯异常,orderMappingQueryParam:{},ex:{}", orderMappingQueryParam, ExceptionUtils.getStackTrace(e));
+            log.error("{} 网络通讯异常,orderQueryParam:{},ex:{}", orderQueryParam, ExceptionUtils.getStackTrace(e));
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
 

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

@@ -2,7 +2,7 @@ package cn.quantgroup.customer.service.impl;
 
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
 import cn.quantgroup.customer.model.order.*;
-import cn.quantgroup.customer.rest.param.ordermapping.OrderMappingQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IKaService;
 import cn.quantgroup.customer.service.IOrderService;
@@ -32,7 +32,7 @@ public class OrderServiceImpl implements IOrderService {
     public JsonResult<List<FlowNode>> findFlowChart(String applyOrderNo) {
         String logPre = "OrderServiceImpl.findFlowChart";
         log.info("{} 查询流程图 applyOrderNo={}", logPre, applyOrderNo);
-        OrderMappingQueryParam param = new OrderMappingQueryParam();
+        OrderQueryParam param = new OrderQueryParam();
         param.setApplyOrderNo(applyOrderNo);
         JsonResult<LoanOrderMapping> orderMappingResult = kaService.findOrderMapping(param);
         LoanOrderMapping head = null;