代码格式化

src/main/java/cn/quantgroup/customer/model/order/ApplyOrder.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 /**
  * 申请订单
+ *
  * @author Wang Xiangwei
  * @version 2020/3/9
  */

src/main/java/cn/quantgroup/customer/model/order/FlowNode.java

@@ -3,7 +3,6 @@ package cn.quantgroup.customer.model.order;
 import lombok.Data;
 
 /**
- *
  * @author Wang Xiangwei
  * @version 2020/3/10
  */

src/main/java/cn/quantgroup/customer/model/order/LoanOrderDetail.java

@@ -7,93 +7,94 @@ import java.util.List;
 
 /**
  * 提现订单详情
+ *
  * @author Wang Xiangwei
  * @version 2020/3/9
  */
 @Data
 public class LoanOrderDetail {
     /**
-     *订单ID
+     * 订单ID
      */
     private Long orderId;
 
     /**
-     *订单申请号
+     * 订单申请号
      */
     private String orderNo;
 
     /**
-     *借款订单号
+     * 借款订单号
      */
     private Long loanId;
 
     /**
-     *提现渠道号
+     * 提现渠道号
      */
     private String channelNo;
 
     /**
-     *提现时间
+     * 提现时间
      */
     private String loanPaidAt;
 
     /**
-     *资金方
+     * 资金方
      */
     private String fund;
 
     /**
-     *合同贷款金额
+     * 合同贷款金额
      */
     private String contractAmount;
 
     /**
-     *合同贷款期数
+     * 合同贷款期数
      */
     private Integer contractTermNo;
 
     /**
-     *担保费
+     * 担保费
      */
     private BigDecimal guaranteeFee;
 
     /**
-     *其他费用
+     * 其他费用
      */
     private BigDecimal otherFee;
 
     /**
-     *一次性服务费
+     * 一次性服务费
      */
     private BigDecimal onceServiceFee;
 
     /**
-     *月利率
+     * 月利率
      */
     private BigDecimal monthlyInterestRate;
 
     /**
-     *当前状态
+     * 当前状态
      */
     private String status;
 
     /**
-     *推送资金方放款时间
+     * 推送资金方放款时间
      */
     private String sendLoanPaidAt;
 
     /**
-     *放款银行卡号
+     * 放款银行卡号
      */
     private String cardNo;
 
     /**
-     *放款银行卡户名
+     * 放款银行卡户名
      */
     private String cardHolderName;
 
     /**
-     *放款银行名称
+     * 放款银行名称
      */
     private String bankName;
 

src/main/java/cn/quantgroup/customer/model/order/Repayment.java

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 
 /**
  * 还款计划信息
+ *
  * @author Wang Xiangwei
  * @version 2020/3/9
  */
@@ -13,77 +14,77 @@ import java.math.BigDecimal;
 public class Repayment {
 
     /**
-     *还款期数
+     * 还款期数
      */
     private Integer termNo;
 
     /**
-     *本金
+     * 本金
      */
     private BigDecimal principal;
 
     /**
-     *利息
+     * 利息
      */
     private BigDecimal interest;
 
     /**
-     *担保费
+     * 担保费
      */
     private BigDecimal premium;
 
     /**
-     *其他担保
+     * 其他担保
      */
     private BigDecimal otherFee;
 
     /**
-     *罚息
+     * 罚息
      */
     private BigDecimal overdueInterest;
 
     /**
-     *逾期保费
+     * 逾期保费
      */
     private BigDecimal overdueServiceFee;
 
     /**
-     *当前减免
+     * 当前减免
      */
     private BigDecimal collectionRelief;
 
     /**
-     *还款总额
+     * 还款总额
      */
     private BigDecimal actualRepayment;
 
     /**
-     *应还总额
+     * 应还总额
      */
     private BigDecimal shouldAmount;
 
     /**
-     *应还时间
+     * 应还时间
      */
     private String shouldAt;
 
     /**
-     *还款时间
+     * 还款时间
      */
     private String repaymentReceivedAt;
 
     /**
-     *还款状态
+     * 还款状态
      */
     private String repaymentStatus;
 
     /**
-     *还款方式
+     * 还款方式
      */
     private String repayType;
 
     /**
-     *逾期天数
+     * 逾期天数
      */
     private Integer overdueDays;
 }

src/main/java/cn/quantgroup/customer/model/xyqbuser/UserBasicInfo.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 /**
  * 信用钱包用户基本展示信息
+ *
  * @author Wang Xiangwei
  * @version 2020/3/9
  */
@@ -37,5 +38,4 @@ public class UserBasicInfo {
     private String status;
 
 
-
 }

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

@@ -14,7 +14,6 @@ import cn.quantgroup.customer.rest.vo.card.XyqbCardsInfo;
 import cn.quantgroup.customer.service.ICardService;
 import cn.quantgroup.customer.service.IUserService;
 import cn.quantgroup.customer.service.IXyqbService;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -36,15 +36,16 @@ public class KaServiceImpl implements IKaService {
     private String kaSysUrl;
 
     @Autowired
-    private  IHttpService httpService;
+    private IHttpService httpService;
+
     @Override
     public JsonResult<LoanOrderMapping> findOrderMapping(OrderMappingQueryParam orderMappingQueryParam) {
         String logPre = "KaServiceImpl.findOrderMapping";
-        log.info("{},获得orderMapping orderMappingQueryParam={}",logPre,orderMappingQueryParam);
+        log.info("{},获得orderMapping orderMappingQueryParam={}", logPre, orderMappingQueryParam);
 
-        if(Objects.isNull(orderMappingQueryParam)){
-            log.error("{} 查询参数为空 orderMappingQueryParam={}",logPre,orderMappingQueryParam);
-            return JsonResult.buildErrorStateResult("查询参数为空",null);
+        if (Objects.isNull(orderMappingQueryParam)) {
+            log.error("{} 查询参数为空 orderMappingQueryParam={}", logPre, orderMappingQueryParam);
+            return JsonResult.buildErrorStateResult("查询参数为空", null);
         }
 
         String applyOrderNo = orderMappingQueryParam.getApplyOrderNo();
@@ -55,24 +56,24 @@ public class KaServiceImpl implements IKaService {
         String url = kaSysUrl + "/external/get/orderMapping";
         try {
             Map<String, Object> param = Maps.newHashMap();
-            if(!Objects.isNull(applyOrderNo)){
+            if (!Objects.isNull(applyOrderNo)) {
                 param.put("applyOrderNo", applyOrderNo);
 
             }
-            if(StringUtils.isNotBlank(channelOrderNo)){
+            if (StringUtils.isNotBlank(channelOrderNo)) {
                 param.put("channelOrderNo", channelOrderNo);
 
             }
-            if(!Objects.isNull(loanId)){
+            if (!Objects.isNull(loanId)) {
                 param.put("loanId", loanId);
             }
 
             String result = httpService.get(url, param);
-            log.info("{} 请求ka系统返回值:{}",logPre, result);
+            log.info("{} 请求ka系统返回值:{}", logPre, result);
             JsonResult jsonResult = GSON.fromJson(result, JsonResult.class);
-            if(Objects.isNull(jsonResult) || !jsonResult.isSuccess()){
-                log.error("{} 查询orderMapping失败 jsonResult={}",logPre,jsonResult);
-                return JsonResult.buildErrorStateResult("查询orderMapping失败",null);
+            if (Objects.isNull(jsonResult) || !jsonResult.isSuccess()) {
+                log.error("{} 查询orderMapping失败 jsonResult={}", logPre, jsonResult);
+                return JsonResult.buildErrorStateResult("查询orderMapping失败", null);
             }
 
             Object data = jsonResult.getData();
@@ -90,28 +91,28 @@ public class KaServiceImpl implements IKaService {
 
 
     @Override
-    public JsonResult<Map<String,String>> findMap(List<String> applyOrderNos) {
+    public JsonResult<Map<String, String>> findMap(List<String> applyOrderNos) {
         String logPre = "KaServiceImpl.findOrderMappingByApplyOrderNos";
-        log.info("{},获得orderMapping applyOrderNos={}",logPre,applyOrderNos);
+        log.info("{},获得渠道订单号 applyOrderNos={}", logPre, applyOrderNos);
 
-        if(CollectionUtils.isEmpty(applyOrderNos)){
-            log.error("{} 查询参数为空 applyOrderNos={}",logPre,applyOrderNos);
-            return JsonResult.buildErrorStateResult("查询参数为空",null);
+        if (CollectionUtils.isEmpty(applyOrderNos)) {
+            log.error("{} 查询参数为空 applyOrderNos={}", logPre, applyOrderNos);
+            return JsonResult.buildErrorStateResult("查询参数为空", null);
         }
 
         String url = kaSysUrl + "/external/query/channelOrder/applyNos";
         StringJoiner stringJoiner = new StringJoiner(",");
         applyOrderNos.forEach(e -> stringJoiner.add(e));
         Map<String, Object> param = Maps.newHashMap();
-        param.put("applyNos",stringJoiner.toString());
+        param.put("applyNos", stringJoiner.toString());
 
-        String result = httpService.get(kaSysUrl, param);
+        String result = httpService.get(url, param);
 
-        log.info("{} 请求ka系统返回值:{}",logPre, result);
+        log.info("{} 请求ka系统返回值:{}", logPre, result);
         JsonResult jsonResult = GSON.fromJson(result, JsonResult.class);
-        if(Objects.isNull(jsonResult) || !jsonResult.isSuccess()){
-            log.error("{} 查询orderMapping失败 jsonResult={}",logPre,jsonResult);
-            return JsonResult.buildErrorStateResult("查询orderMapping失败",null);
+        if (Objects.isNull(jsonResult) || !jsonResult.isSuccess()) {
+            log.error("{} 获得渠道订单号 jsonResult={}", logPre, jsonResult);
+            return JsonResult.buildErrorStateResult("获得渠道订单号", null);
         }
 
         return jsonResult;

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

@@ -29,31 +29,31 @@ public class OrderServiceImpl implements IOrderService {
 
     @Override
     public JsonResult<List<FlowNode>> findFlowChart(String applyOrderNo) {
-        String logPre="OrderServiceImpl.findFlowChart";
-        log.info("{} 查询流程图 applyOrderNo={}",logPre,applyOrderNo);
+        String logPre = "OrderServiceImpl.findFlowChart";
+        log.info("{} 查询流程图 applyOrderNo={}", logPre, applyOrderNo);
         OrderMappingQueryParam param = new OrderMappingQueryParam();
         param.setApplyOrderNo(applyOrderNo);
         JsonResult<LoanOrderMapping> orderMappingResult = kaService.findOrderMapping(param);
         LoanOrderMapping head = null;
-        if(orderMappingResult.isSuccess()){
+        if (orderMappingResult.isSuccess()) {
             head = orderMappingResult.getData();
-            log.info("{},申请订单号查询orderMapping applyOrderNo={},data={}",logPre,applyOrderNo,head);
+            log.info("{},申请订单号查询orderMapping applyOrderNo={},data={}", logPre, applyOrderNo, head);
         }
 
         JsonResult<List<FlowNode>> flowChart = xyqbService.findFlowChart(applyOrderNo);
-        if(!flowChart.isSuccess()){
+        if (!flowChart.isSuccess()) {
             return flowChart;
         }
 
         List<FlowNode> flowNodeList = flowChart.getData();
-        if(!Objects.isNull(head)){
+        if (!Objects.isNull(head)) {
             FlowNode flowNode = new FlowNode();
             flowNode.setName("渠道用户信息导入");
             flowNode.setStatus(1);
             flowNode.setNode(head.getId().toString());
-            flowNodeList.add(0,flowNode);
+            flowNodeList.add(0, flowNode);
         }
 
-        return JsonResult.buildSuccessResult("",flowNodeList);
+        return JsonResult.buildSuccessResult("", flowNodeList);
     }
 }

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

@@ -408,16 +408,16 @@ public class UserServiceImpl implements IUserService {
             return applyOrders;
         }
 
-        List<ApplyOrder> applyOrderList =  applyOrders.getData();
-
+        List<ApplyOrder> applyOrderList = applyOrders.getData();
+        //通过申请订单号获得渠道订单号
         List<String> applyOrderNoList = applyOrderList.stream().map(e -> e.getApplyOrderNo()).distinct().collect(Collectors.toList());
         JsonResult<Map<String, String>> mapJsonResult = kaService.findMap(applyOrderNoList);
-        if(!mapJsonResult.isSuccess()){
+        if (!mapJsonResult.isSuccess()) {
             return mapJsonResult;
         }
 
         Map<String, String> data = mapJsonResult.getData();
-        applyOrderList.forEach(e ->{
+        applyOrderList.forEach(e -> {
             e.setChannelOrderNo(data.get(e.getApplyOrderNo()));
         });
 

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

@@ -10,20 +10,14 @@ import cn.quantgroup.customer.rest.param.repay.RepayOrderQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IXyqbService;
 import cn.quantgroup.customer.service.http.IHttpService;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static cn.quantgroup.customer.constant.Constant.GSON;
 
@@ -96,8 +90,8 @@ public class XyqbServiceImpl implements IXyqbService {
 
     @Override
     public JsonResult<List<FlowNode>> findFlowChart(String orderNo) {
-        String logPre="XyqbServiceImpl.findFlowChart";
-        log.info("{} 流程日志查询 orderNo={}",logPre,orderNo);
+        String logPre = "XyqbServiceImpl.findFlowChart";
+        log.info("{} 流程日志查询 orderNo={}", logPre, orderNo);
         String url = xyqbSysUrl + "/ex/inside/customer_sys/query/applyOrder";
         if (StringUtils.isEmpty(orderNo)) {
             log.error("{} 申请订单号为空 orderNo={}", logPre, orderNo);
@@ -110,15 +104,15 @@ public class XyqbServiceImpl implements IXyqbService {
         header.put("Content-type", "application/x-www-form-urlencoded");
         JsonResult jsonResult = httpService.post(url, header, param, JsonResult.class);
 
-        if(Objects.isNull(jsonResult) || !jsonResult.isSuccess()){
-            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}",logPre,url, header,param,jsonResult);
-            return JsonResult.buildErrorStateResult("流程日志查询失败",null);
+        if (Objects.isNull(jsonResult) || !jsonResult.isSuccess()) {
+            log.error("{} 调用信用钱包失败 url={}, header={},param={},result={}", logPre, url, header, param, jsonResult);
+            return JsonResult.buildErrorStateResult("流程日志查询失败", null);
         }
 
         List data = (List) jsonResult.getData();
         List<FlowNode> flowNodeList = new ArrayList<>();
-        data.forEach( e ->{
-            flowNodeList.add(GSON.fromJson(e.toString(),FlowNode.class));
+        data.forEach(e -> {
+            flowNodeList.add(GSON.fromJson(e.toString(), FlowNode.class));
         });
         jsonResult.setData(flowNodeList);
         return jsonResult;