D3逾期报送逻辑优化。

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

@@ -391,20 +391,23 @@ public class BaiHangZhuDaiService {
                     String id = "";
                     String reqId_log = repaymentLoanInfo.getReqID();
                     try {
-                        RepaymentInfoZhuDai repaymentLoanInfo1 = repaymentLoanInfoDbMapper.findLastOne(BaiHangRepayment.builder().loanId(repaymentLoanInfo.getLoanId()).termNo(repaymentLoanInfo.getTermNo()).build());
-                        if (j > 0 && Objects.nonNull(repaymentLoanInfo1)) {//逾期的，跳过
-                            tg_atomicInt.getAndIncrement();
-                            log.info("量化派助贷TO百行报送-实时还款逾期跳过报送, reqId_log: {} , loanId: {} , termNo: {} , startnyr: {} , endnyr: {} , bean: {} ", reqId_log, repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo(), startnyr, endnyr, JSON.toJSONString(repaymentLoanInfo1));
-
-                            //----------2020.02.02 保存跳过的数据，用于以后补全
-                            try{
-                                FileUtils.write(new File("/home/quant_group/baihang-report/data/baihang/D3/yuqi_tg/"+startnyr+"_"+endnyr+".json"),
-                                        JSON.toJSONString(repaymentLoanInfo)+"\r\n", "UTF-8", true);
-                            }catch (Exception e){
-                                log.error("量化派助贷TO百行报送-实时逾期跳过, Json数据保存文件异常,",e);
-                            }
+                        if (j > 0){ //逾期
+                            RepaymentInfoZhuDai repaymentLoanInfo1 = repaymentLoanInfoDbMapper.findLastOne(BaiHangRepayment.builder().loanId(repaymentLoanInfo.getLoanId()).termNo(repaymentLoanInfo.getTermNo()).sendDate(startnyr).build());
+                            ////if (j > 0 && Objects.nonNull(repaymentLoanInfo1)) {  //逾期的，跳过
+                            if (Objects.nonNull(repaymentLoanInfo1)) {  //逾期的，跳过
+                                tg_atomicInt.getAndIncrement();
+                                log.info("量化派助贷TO百行报送-实时还款逾期跳过报送, reqId_log: {} , loanId: {} , termNo: {} , startnyr: {} , endnyr: {} , bean: {} ", reqId_log, repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo(), startnyr, endnyr, JSON.toJSONString(repaymentLoanInfo1));
+
+                                //----------2020.02.02 保存跳过的数据，用于以后补全
+                                try{
+                                    FileUtils.write(new File("/home/quant_group/baihang-report/data/baihang/D3/yuqi_tg/"+startnyr+"_"+endnyr+".json"),
+                                            JSON.toJSONString(repaymentLoanInfo)+"\r\n", "UTF-8", true);
+                                }catch (Exception e){
+                                    log.error("量化派助贷TO百行报送-实时逾期跳过, Json数据保存文件异常,",e);
+                                }
 
-                            continue;
+                                continue;
+                            }
                         }
                         totail_atomicInt.getAndIncrement();
 
@@ -426,7 +429,7 @@ public class BaiHangZhuDaiService {
                         repaymentLoanInfo.setMobile(interfaceUploadClient(repaymentLoanInfo.getMobile()));
 
                         String resultStr = iHttpService.postBaiHang(baiHangRepayMentLoanInfoUrl, getHeader(), JSON.toJSONString(repaymentLoanInfo));
-                        log.info("助贷还款用户报送结果, param: {} , resultStr: {} ", logJson, resultStr);
+                        log.info("助贷还款用户报送结果, J: {} , param: {} , resultStr: {} ", j, logJson, resultStr);
                         if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
                             log.info("量化派助贷TO百行报送-还款返回结果不正确, 开始时间: {} , 结束时间: {} , reqId_log: {} , recordId: {} , loanId: {} , bean: {} ", startnyr, endnyr, reqId_log, id, repaymentLoanInfo.getLoanId(), JSON.toJSONString(repaymentLoanInfo));
                             repaymentLoanInfoDbMapper.updateCurrentRecordEnableFalse(BaiHangUpDateRecord.builder().enable("0").recordId(id).build());

src/main/resources/cn/quantgroup/report/mapper/master/RepaymentLoanInfoDbMapper.xml

@@ -76,7 +76,10 @@
 
   <select id="findLastOne" parameterType="cn.quantgroup.report.domain.baihang.BaiHangRepayment" resultType="cn.quantgroup.report.domain.baihang.RepaymentInfoZhuDai">
         select id, record_id, req_id, loan_id, term_no, status_confirm_at, term_status
-         from repayment_loan_info_zhudai where loan_id = #{loanId} and term_no = #{termNo} limit 1;
+         from repayment_loan_info_zhudai where loan_id = #{loanId} and term_no = #{termNo}
+         <!--2020.01.07 17:55 值针对当天，还款报了，逾期又有一条的情况 DATE_FORMAT(now(),'%Y-%m-%d') -->
+         and  created_at >= #{sendDate}
+         limit 1;
   </select>