Skip to content

B
baihang-report
Commit 9ed8263f authored by 郝彦辉's avatar 郝彦辉
Browse files
Options

手动报送，自动化工具。

parent efe8a960
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 325 additions and 239 deletions
src/main/java/cn/quantgroup/report/controller/ManualToolController.java
View file @ 9ed8263f
......@@ -36,9 +36,9 @@ public class ManualToolController {
@RequestMapping("/send/baihang")
public GlobalResponse sendBaihang(String p1,String p2,String p3,String p4,String p5,String secretKey, String isSend,String errorCode) {
public GlobalResponse sendBaihang(String p1,String p2,String p3,String p4,String p5,String secretKey, String isSend,String errorCode, String isProduct, String sendIncludeType) {
try{
return manualToolService.sendBaiHangData(p1,p2,p3,p4,p5,secretKey,isSend,errorCode);
return manualToolService.sendBaiHangData(p1,p2,p3,p4,p5,secretKey,isSend,errorCode, isProduct, sendIncludeType);
}catch (Exception e){
log.error("百行征信手动报送异常, {} , {} ", e.getMessage(), e);
return GlobalResponse.generate(e.getMessage());
......@@ -64,24 +64,6 @@ public class ManualToolController {
}
/**
* 描述: 应商务要求测试-品钛高德分 <br/>
* 参数: [jsonFile] <br/>
* 返回值: GlobalResponse <br/>
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.10.17 <br/>
*/
@RequestMapping("/request/pinTaiCreditScoreV1")
public GlobalResponse pinTaiCreditScoreV1(String filePath,String p3,String secretKey) {
try{
return manualToolService.testPTCreditScoreV1(filePath,p3,secretKey);
}catch (Exception e){
log.error("品钛高德分测试异常, {} , {} ", e.getMessage(), e);
return GlobalResponse.generate(e.getMessage());
}
}
/**
* 描述: 手动刷新getUuiidWhiteListByServiceAndMethod <br/>
* 参数: [p3, secretKey] <br/>
......
src/main/java/cn/quantgroup/report/controller/external/ExZhuDaiBaiHangReSendController.java
View file @ 9ed8263f
......@@ -20,11 +20,15 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
/**
* 百行征信报送出现错误的贷款记录信息重新报送
*
* @Author fengjunkai
* @Date 2019-04-15 17:27
* -----------------------------------------------------------------------------<br>
* 描述: 北京众信利民信息技术有限公司 助贷模式To百行征信报送<br>
* 作者：yanhui.Hao <br>
* 时间：2019.11.20 <br>
* 授权: (C) Copyright (c) 2017 <br>
* 公司: 北京众信利民信息技术有限公司 <br>
* -----------------------------------------------------------------------------
*/
@RestController
@RequestMapping("/zhudai/re_send")
......@@ -127,7 +131,7 @@ public class ExZhuDaiBaiHangReSendController {
//---------------------------------------------------------------------
/**
* 描述: 手动重新报送部分放款D2逻辑问题数据 <br/>
* 描述: 手动重新报送部分申请A1逻辑问题数据 <br/>
* 参数: [] <br/>
* 返回值: cn.quantgroup.report.response.GlobalResponse <br/>
* 创建人: yanhui.Hao <br/>
......
src/main/java/cn/quantgroup/report/domain/baihang/LoanInfoVo.java deleted 100644 → 0
View file @ efe8a960
package cn.quantgroup.report.domain.baihang;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* -----------------------------------------------------------------------------<br>
* 描述: 放款用户信息,用于手动报送 <br>
* 作者：yanhui.Hao <br>
* 时间：2019.09.25 <br>
* 授权: (C) Copyright (c) 2017 <br>
* 公司: 北京众信利民信息技术有限公司 <br>
* -----------------------------------------------------------------------------
*/
@Data
public class LoanInfoVo implements Serializable {
private static final long serialVersionUID = 7293591774673907983L;
private Integer reqID; //记录唯一ID
//private String recordId;
private String opCode; //操作代码A-增加 M-修改
private String uploadTs; //记录生成时间 ISO 8601格式 LocalDateTime生成
private String name; //姓名
private String pid; //身份证好
private String mobile; //手机号
private String loanId; //贷款编号
private int guaranteeType; //贷款担保类型
private int loanPurpose; //借款用途
private String applyDate;// 贷款申请时间
private String accountOpenDate; //账户开立时间
private String issueDate; //贷款放款时间
private String dueDate; //贷款到期日期 YYYY-MM-DD
private BigDecimal loanAmount; //贷款金额
private int totalTerm; //还款总期数
private String targetRepayDateType; //账单日类型
private String termPeriod;//每期还款周期
private String firstRepaymentDate; //首次应还款日期 YYYY-MM-DD
private String gracePeriod; //宽限日
//private String targetRepayDateList; //账单日列表
}
src/main/java/cn/quantgroup/report/domain/baihang/RepaymentLoanInfoVo.java → src/main/java/cn/quantgroup/report/domain/baihang/RepaymentLoanInfoLog.java
View file @ 9ed8263f
......@@ -12,12 +12,11 @@ import java.math.BigDecimal;
* @Date 2019-03-26 15:13
*/
@Data
public class RepaymentLoanInfoVo implements Serializable {
public class RepaymentLoanInfoLog implements Serializable {
private static final long serialVersionUID = 8722959335665582382L;
private String reqID; //记录唯一标示
private String recordId;
private String opCode; //操作CODE a-增加 m-修改
private String uploadTs; //记录生成时间 ISO 8601
private String loanId; //贷款ID
......@@ -37,6 +36,8 @@ public class RepaymentLoanInfoVo implements Serializable {
private BigDecimal remainingAmount; //贷款余额
private int loanStatus; //本笔贷款状态
private String recordId;
private Long id;
private Integer enable;
private String createdAt;
......
src/main/java/cn/quantgroup/report/mapper/baihang/LoanInfoMapper.java
View file @ 9ed8263f
package cn.quantgroup.report.mapper.baihang;
import cn.quantgroup.report.domain.baihang.BaiHangTimeRecord;
import cn.quantgroup.report.domain.baihang.LoanInfoVo;
import cn.quantgroup.report.domain.baihang.LoanInfoZhuDai;
import org.springframework.stereotype.Repository;
......@@ -44,11 +43,11 @@ public interface LoanInfoMapper {
/**
* 描述: 根据loan_application_history_id查询手动报送的bean <br/>
* 参数: loanApplicationHistoryId <br/>
* 返回值: LoanInfoVo <br/>
* 返回值: LoanInfoZhuDai <br/>
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.09.25 <br/>
*/
LoanInfoVo findLoanInfoVoByHistoryId(String loanApplicationHistoryId);
LoanInfoZhuDai findLoanInfoD2ByHistoryId(String loanApplicationHistoryId);
......
src/main/java/cn/quantgroup/report/mapper/master/ApplyLoanInfoDbMapper.java
View file @ 9ed8263f
package cn.quantgroup.report.mapper.master;
import cn.quantgroup.report.domain.baihang.ApplyLoanInfo;
import cn.quantgroup.report.domain.baihang.ApplyLoanInfoZhuDai;
import cn.quantgroup.report.domain.baihang.LoanInfoZhuDai;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -18,4 +20,14 @@ public interface ApplyLoanInfoDbMapper {
List<ApplyLoanInfo> findAll();
/**
* 描述: 根据loan_application_history_id查询手动报送的申请bean <br/>
* 参数: loanApplicationHistoryId <br/>
* 返回值: ApplyLoanInfoZhuDai <br/>
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.09.25 <br/>
*/
ApplyLoanInfoZhuDai findApplyInfoA1ByHistoryId(String loanApplicationHistoryId);
}
src/main/java/cn/quantgroup/report/mapper/master/RepaymentLoanInfoDbMapper.java
View file @ 9ed8263f
......@@ -3,7 +3,7 @@ package cn.quantgroup.report.mapper.master;
import cn.quantgroup.report.domain.baihang.BaiHangRepayment;
import cn.quantgroup.report.domain.baihang.BaiHangUpDateRecord;
import cn.quantgroup.report.domain.baihang.RepaymentInfoZhuDai;
import cn.quantgroup.report.domain.baihang.RepaymentLoanInfoVo;
import cn.quantgroup.report.domain.baihang.RepaymentLoanInfoLog;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -35,6 +35,6 @@ public interface RepaymentLoanInfoDbMapper {
* 创建人: yanhui.Hao <br/>
* 创建时间: 2019.09.24 <br/>
*/
List<RepaymentLoanInfoVo> findByRecordId(String[] recordIdArray);
List<RepaymentLoanInfoLog> findByD3RecordId(String[] recordIdArray);
}
src/main/java/cn/quantgroup/report/service/manualTool/ShellUtils.java
View file @ 9ed8263f
......@@ -177,7 +177,7 @@ public class ShellUtils {
}
this.outputStream.flush();
Thread.sleep(3000);
Thread.sleep(4000);
} catch (IOException e) {
log.error("shellUtils execute error,", e.getMessage());
e.printStackTrace();
......
src/main/resources/cn/quantgroup/report/mapper/baihang/LoanInfoMapper.xml
View file @ 9ed8263f
......@@ -3,7 +3,7 @@
<mapper namespace="cn.quantgroup.report.mapper.baihang.LoanInfoMapper">
<resultMap id="LoanInfoResultMap" type="cn.quantgroup.report.domain.baihang.LoanInfoVo">
<!--<resultMap id="LoanInfoResultMap" type="cn.quantgroup.report.domain.baihang.LoanInfoVo">
<result column="reqID" jdbcType="VARCHAR" property="reqID"/>
<result column="opCode" jdbcType="VARCHAR" property="opCode"/>
<result column="uploadTs" jdbcType="VARCHAR" property="uploadTs"/>
......@@ -23,10 +23,11 @@
<result column="termPeriod" jdbcType="VARCHAR" property="termPeriod"/>
<result column="firstRepaymentDate" jdbcType="VARCHAR" property="firstRepaymentDate"/>
<result column="gracePeriod" jdbcType="VARCHAR" property="gracePeriod"/>
</resultMap>
</resultMap>-->
<resultMap id="LoanInfoVoResultMapByBS" type="cn.quantgroup.report.domain.baihang.LoanInfoZhuDai"><!-- LoanInfoVo-->
<resultMap id="LoanInfoVoResultMapByBS" type="cn.quantgroup.report.domain.baihang.LoanInfoVo">
<result column="reqID" jdbcType="INTEGER" property="reqID"/>
<result column="opCode" jdbcType="VARCHAR" property="opCode"/>
<result column="uploadTs" jdbcType="VARCHAR" property="uploadTs"/>
......@@ -190,42 +191,52 @@
<!--2.根据loan_application_history_id查询工具报送的bean 放款 2019.09.25-->
<select id="findLoanInfoVoByHistoryId" resultMap="LoanInfoVoResultMapByBS">
SELECT a.loan_application_history_id reqID,'A' opCode,DATE_FORMAT(now(), '%Y-%m-%dT%H:%i:%S') uploadTs,
b.name name, b.id_no pid,b.phone_no mobile,
IF (d.order_no IS NULL,a.loan_application_history_id,d.order_no) loanId,
'1' guaranteeType,'1' loanPurpose,
DATE_FORMAT(
CASE
WHEN i.created_at IS NULL AND h.created_at &lt;= f.created_at THEN h.created_at
WHEN i.created_at IS NULL AND h.created_at &gt; f.created_at THEN f.created_at
ELSE i.created_at
END, '%Y-%m-%dT%H:%i:%S'
) AS applyDate,
DATE_FORMAT(
CASE
WHEN d.created_at IS NULL AND f.created_at &gt;= h.created_at THEN f.created_at
WHEN d.created_at IS NULL AND f.created_at &lt; h.created_at THEN h.created_at
ELSE d.created_at
END, '%Y-%m-%dT%H:%i:%S'
) AS accountOpenDate,
DATE_FORMAT(a.loan_paid_at,'%Y-%m-%dT%H:%i:%S') issueDate,
date(date_sub(e.deadline, INTERVAL 1 SECOND)) dueDate,a.contract_loan_amount loanAmount,a.contract_term totalTerm,
IF (a.contract_term = 1, '1', '2') targetRepayDateType,
IF (a.contract_term = 1,'30','-1') termPeriod,
date(date_sub(g.deadline, INTERVAL 1 SECOND)) firstRepaymentDate,'0' gracePeriod
FROM xyqb_i_loan_application_manifest_history a
LEFT JOIN xyqb_user_i_user_detail b ON a.user_id = b.user_id
LEFT JOIN xyqb_i_loan_account_ext c ON a.loan_application_history_id = c.loan_id
LEFT JOIN xyqb_i_apply_quota_record d ON c.order_no = d.order_no
LEFT JOIN xyqb_i_repayment_plan e ON a.loan_application_history_id = e.loan_application_history_id
LEFT JOIN xyqb_i_loan_submit_info f ON a.loan_application_history_id = f.loan_id
LEFT JOIN xyqb_i_repayment_plan g ON a.loan_application_history_id = g.loan_application_history_id
LEFT JOIN xyqb_i_loan_application_history h ON a.loan_application_history_id = h.id
LEFT JOIN xyqb_i_quota_credit i ON d.order_no = i.order_no
/*WHERE a.funding_corp_id IN (480,710)*/
WHERE a.funding_corp_id IN (480,710,630,790,820)
AND e.term_no = a.contract_term AND g.term_no = 1 AND a.transaction_status IN (2, 5)
<select id="findLoanInfoD2ByHistoryId" resultType="cn.quantgroup.report.domain.baihang.LoanInfoZhuDai"> <!--resultMap="LoanInfoVoResultMapByBS"-->
select a.loan_application_history_id reqID
,'A' opCode
,DATE_FORMAT(now(),'%Y-%m-%dT%H:%i:%S') uploadTs
,if(a.funding_corp_id in (240,640,700),'深圳市小赢科技有限责任公司','广州惠金小额贷款有限公司') institutionalFundingPartner
,if(a.funding_corp_id in (240,640,700),'91440300MA5DMXHN4R','91440101MA59G7X78Y') institutionalFundingPartnerID
,j.corp_loan_id relationID
,'' institutionalFundingPartnerLoanID
,if(d.order_no is null,a.loan_application_history_id,d.order_no) orderID
,'' preCreditLimit
,b.name name
,b.id_no pid
,b.phone_no mobile
,if(d.order_no is null,a.loan_application_history_id,d.order_no) loanId
,'1' guaranteeType
,'1' loanPurpose
,DATE_FORMAT(case when i.created_at is null and h.created_at &lt;=f.created_at then h.created_at
when i.created_at is null and h.created_at>f.created_at then f.created_at
else i.created_at end,'%Y-%m-%dT%H:%i:%S') as applyDate
,DATE_FORMAT(case when d.created_at is null and f.created_at>=h.created_at then f.created_at
when d.created_at is null and f.created_at &lt; h.created_at then h.created_at
else d.created_at end,'%Y-%m-%dT%H:%i:%S') as accountOpenDate
,DATE_FORMAT(a.loan_paid_at,'%Y-%m-%dT%H:%i:%S') issueDate
,date(date_sub(e.deadline,INTERVAL 1 second)) dueDate
,a.contract_loan_amount loanAmount
,a.contract_term totalTerm
,'2' targetRepayDateType
,'-1' termPeriod
,date(date_sub(g.deadline,INTERVAL 1 second)) firstRepaymentDate
-- ,'0' gracePeriod
-- ,'30' gracePeriod
,if(a.funding_corp_id in (880,890),'30','0') gracePeriod
from xyqb_i_loan_application_manifest_history a
left join xyqb_user_i_user_detail b on a.user_id=b.user_id
left join xyqb_i_loan_account_ext c on a.loan_application_history_id=c.loan_id
left join xyqb_i_apply_quota_record d on c.order_no=d.order_no
left join xyqb_i_repayment_plan e on a.loan_application_history_id=e.loan_application_history_id
left join xyqb_i_loan_submit_info f on a.loan_application_history_id=f.loan_id
left join xyqb_i_repayment_plan g on a.loan_application_history_id=g.loan_application_history_id
left join xyqb_i_loan_application_history h on a.loan_application_history_id=h.id
left join xyqb_i_quota_credit i on d.order_no=i.order_no
left join xyqb_i_waiting_funding_corp_operate_people j on a.loan_application_history_id=j.loan_application_history_id
where a.funding_corp_id in (420,520,580,650,670,810,240,640,700, 880,890) and
e.term_no=a.contract_term and g.term_no=1
and a.contract_term not in (2,3)
and a.transaction_status in (2,5)
AND a.loan_application_history_id=#{loanApplicationHistoryId}
</select>
......
src/main/resources/cn/quantgroup/report/mapper/master/ApplyLoanInfoDbMapper.xml
View file @ 9ed8263f
......@@ -22,5 +22,54 @@
</select>
<!--1.根据loan_application_history_id查询工具报送的bean 申请A1 2019.10.20-->
<select id="findApplyInfoA1ByHistoryId" resultType="cn.quantgroup.report.domain.baihang.ApplyLoanInfoZhuDai">
select
a.id reqID
,'A' opCode
,DATE_FORMAT(now(),'%Y-%m-%dT%H:%i:%S') uploadTs
,'1' isFinTechAgencyBusiness
,DATE_FORMAT(case when i.created_at is null and h.created_at &lt;=f.created_at then h.created_at
when i.created_at is null and h.created_at>f.created_at then f.created_at
else i.created_at end,'%Y-%m-%dT%H:%i:%S') as applyDate
,if(d.order_no is null,a.loan_application_history_id,d.order_no) applyId
,'1' applyType
,b.name name
,'1' idType
,b.id_no pid
,b.phone_no mobile
,b.email emailAddress
,case when j.education=1 then '10'
when j.education=2 then '20'
when j.education=3 then '30'
when j.education in (4,6) then '40'
when j.education=5 then '50'
when j.education in (7,8) then '60'
else '70' end eduBackground
,'500' degree
,'1' guaranteeType
,'1' loanPurpose
,'99' customType
,'-1' applyAmount
,'8' livingCondition
,case when j.marry_status=1 then '10'
when j.marry_status=2 then '20'
when j.marry_status=4 then '30'
when j.marry_status=3 then '40'
else '90' end marriageStatus
from xyqb_i_loan_application_manifest_history a
left join xyqb_user_i_user_detail b on a.user_id=b.user_id
left join xyqb_i_loan_account_ext c on a.loan_application_history_id=c.loan_id
left join xyqb_i_apply_quota_record d on c.order_no=d.order_no
left join xyqb_i_loan_submit_info f on a.loan_application_history_id=f.loan_id
left join xyqb_i_loan_application_history h on a.loan_application_history_id=h.id
left join xyqb_i_quota_credit i on d.order_no=i.order_no
left join xyqb_i_loan_base_info j on a.loan_application_history_id=j.loan_id
where a.funding_corp_id in (420,520,580,650,670,810,240,640,700, 880,890)
and a.contract_term not in (2,3)
and a.transaction_status in (2,5)
AND a.loan_application_history_id=#{loanApplicationHistoryId}
</select>
</mapper>
\ No newline at end of file
src/main/resources/cn/quantgroup/report/mapper/master/RepaymentLoanInfoDbMapper.xml
View file @ 9ed8263f
......@@ -26,10 +26,9 @@
<result column="loanStatus" jdbcType="INTEGER" property="loan_status"/>
</resultMap>
<resultMap id="RepaymentLoanInfoVoResultMapByBS" type="cn.quantgroup.report.domain.baihang.RepaymentLoanInfoVo">
<result column="id" jdbcType="DECIMAL" property="id"/>
<resultMap id="RepaymentLoanInfoVoResultMapByBS" type="cn.quantgroup.report.domain.baihang.RepaymentLoanInfoLog">
<result column="reqID" jdbcType="VARCHAR" property="req_id"/>
<result column="recordId" jdbcType="VARCHAR" property="record_id"/>
<result column="opCode" jdbcType="VARCHAR" property="op_code"/>
<result column="uploadTs" jdbcType="VARCHAR" property="upload_ts"/>
<result column="loanId" jdbcType="VARCHAR" property="loan_id"/>
......@@ -48,6 +47,9 @@
<result column="overdueAmount" jdbcType="DECIMAL" property="overdue_amount"/>
<result column="remainingAmount" jdbcType="DECIMAL" property="remaining_amount"/>
<result column="loanStatus" jdbcType="INTEGER" property="loan_status"/>
<result column="recordId" jdbcType="VARCHAR" property="record_id"/>
<result column="id" jdbcType="DECIMAL" property="id"/>
<result column="enable" jdbcType="INTEGER" property="enable"/>
<result column="createdAt" jdbcType="VARCHAR" property="created_at"/>
<result column="updatedAt" jdbcType="VARCHAR" property="updated_at"/>
......@@ -78,7 +80,7 @@
<!--根据日志中的reqID查询loan_id及还款信息 2019.09.25-->
<select id="findByRecordId" resultMap="RepaymentLoanInfoVoResultMapByBS">
<select id="findByD3RecordId" resultMap="RepaymentLoanInfoVoResultMapByBS">
SELECT * from repayment_loan_info_zhudai
WHERE op_code='A' and record_id IN
<foreach collection="array" item="recordId" index="index" open="(" close=")" separator=",">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment