重新跑p2p的D3存量，并且在172.20.6.21

src/main/java/cn/quantgroup/report/config/datasource/baihang/BaiHangDataSourcePreperties.java

@@ -17,8 +17,11 @@ public class BaiHangDataSourcePreperties {
     @Value("${baihang.db.maxPoolSize}")
     private int maxPoolSize;
 
-    @Value("${data.source.baihang.jdbcUrl}")
-    private String jdbcUrl;
+    //@Value("${data.source.baihang.jdbcUrl}")
+    //private String jdbcUrl = "jdbc:mysql://172.20.6.29:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
+    private String jdbcUrl = "jdbc:mysql://172.20.6.21:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
+
+
     @Value("${data.source.baihang.username}")
     private String username;
     @Value("${data.source.baihang.password}")

src/main/java/cn/quantgroup/report/config/datasource/history/XyqbHistoryDataSourcePreperties.java

@@ -18,7 +18,8 @@ public class XyqbHistoryDataSourcePreperties {
     private int maxPoolSize;
 
     //@Value("${data.source.baihang.jdbcUrl}")
-    private String jdbcUrl="jdbc:mysql://172.20.6.29:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
+    //private String jdbcUrl="jdbc:mysql://172.20.6.29:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
+    private String jdbcUrl = "jdbc:mysql://172.20.6.21:4010/rc_real_time_data_pool?useUnicode=true&characterEncoding=UTF8&useSSL=false";
 
     //@Value("${data.source.baihang.username}")
     private String username="xyqb_history_w";

src/main/java/cn/quantgroup/report/service/baihang/BaiHangZhuDaiService.java

@@ -979,7 +979,7 @@ public class BaiHangZhuDaiService {
                     for (int j = 0; j < repaymentInfoList.size(); j++) {
                         RepaymentInfoZhuDai repaymentInfo = repaymentInfoList.get(j);
                         String id = UUID.randomUUID().toString().replaceAll("-", "");
-                        log.info("history log D3 oldReqID="+repaymentInfo.getReqID()+",newReqID="+id);
+                        log.info("history log D3 oldReqID="+repaymentInfo.getReqID()+",newReqID="+id+",loanId="+repaymentInfo.getLoanId());
                         repaymentInfo.setReqID(id);
 
                         //2019.11.18

src/main/resources/cn/quantgroup/report/mapper/baihang/RepaymentLoanInfoMapper.xml

@@ -431,7 +431,8 @@
         group by if(d.order_no is null,a.loan_application_history_id,d.order_no),
         if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.term_no,h.max_term);
         -->
-
+        <!-- 助贷 -->
+        <!--
                select
                a.id reqID
                ,'A' opCode
@@ -531,9 +532,9 @@
                and if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.term_no,h.max_term)=j.term_no
                group by if(d.order_no is null,a.loan_application_history_id,d.order_no),
                if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.term_no,h.max_term);
-
+               -->
         <!--p2p 2019.12.13-->
-        <!--
+
         select
         a.id reqID
         ,'A' opCode
@@ -560,7 +561,9 @@
         end as loanStatus
         ,if(f.yqze>0,'overdue','normal') termStatus
         from (
-        select a.*,if(c.term_no is null,a.term_no,c.term_no) next_term
+        select -- a.*,
+        a.id,a.user_id,a.loan_application_history_id,a.term_no,a.deadline,a.required_repayment,a.repayment_status,a.repaid_at,a.created_at,
+        if(c.term_no is null,a.term_no,c.term_no) next_term
         ,if(c.deadline is null,a.deadline,c.deadline) next_deadline
         ,b.loan_paid_at
         from xyqb_i_repayment_plan_p2p_bak a
@@ -570,6 +573,9 @@
         and a.term_no=c.term_no-1
         left join xyqb_i_loan_withdraw_record k on a.loan_application_history_id=k.loan_id
         left join xyqb_i_repayment_plan_p2p_bak g on b.loan_application_history_id=g.loan_application_history_id
+
+        and g.term_no=b.contract_term
+
         where a.repaid_at>=#{startTime,jdbcType=VARCHAR} and a.repaid_at &lt; #{endTime,jdbcType=VARCHAR} and a.repayment_status=3
         and b.funding_corp_id in (210,540)
         and if(b.loan_paid_at>='2018-01-01',b.contract_term >3,b.contract_term >=3)
@@ -633,7 +639,7 @@
         and if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.term_no,h.max_term)=j.term_no
         group by if(d.order_no is null,a.loan_application_history_id,d.order_no),
         if(DATEDIFF(a.next_deadline,a.repaid_at)>1,a.term_no,h.max_term);
-        -->
+
     </select>
 
     <!--3.2百行助贷-联合贷  实时还款 2019.10.28-->
@@ -782,7 +788,8 @@
         group by a.loan_application_history_id) f on a.loan_application_history_id=f.loan_application_history_id
         left join xyqb_i_repayment_record g on a.id=g.repayment_plan_id;
         -->
-
+        <!-- 助贷 -->
+        <!--
         select
         a.id reqID
         ,'A' opCode
@@ -836,9 +843,8 @@
         group by a.loan_application_history_id
         ) f on a.loan_application_history_id=f.loan_application_history_id
         left join xyqb_i_repayment_record g on a.id=g.repayment_plan_id;
-
+        -->
         <!-- p2p 2019.12.13 -->
-        <!--
         select
         a.id reqID
         ,'A' opCode
@@ -863,7 +869,8 @@
         when f.yqze=0 and f.dkye>0 then '1'
         end as loanStatus
         ,'overdue' termStatus
-        from (select a.*
+        from (select  -- a.*
+        a.id,a.user_id,a.loan_application_history_id,a.term_no,a.deadline,a.required_repayment,a.repayment_status,a.repaid_at,a.repayment_received_at
         from xyqb_i_repayment_plan_p2p_bak a
         left join xyqb_i_loan_a_m_history_p2p_bak b /**xyqb_i_loan_application_manifest_history b*/
         on a.loan_application_history_id=b.loan_application_history_id and b.loan_paid_at &lt; #{endTime,jdbcType=VARCHAR}
@@ -895,7 +902,7 @@
         where b.funding_corp_id in (210,540)
         group by a.loan_application_history_id) f on a.loan_application_history_id=f.loan_application_history_id
         left join xyqb_i_repayment_record g on a.id=g.repayment_plan_id;
-        -->
+
 </select>
 
 <!--4.2百行助贷-联合贷  实时逾期还款 2019.10.28-->