接口报送bug

src/main/java/cn/quantgroup/report/job/QuantGroupZhuDaiReportToBaiHang.java

@@ -46,7 +46,7 @@ public class QuantGroupZhuDaiReportToBaiHang {
     private DingTalk dingTalk;
 
     @Async
-    //@Scheduled(cron = "0 0 5 * * ?")
+    @Scheduled(cron = "0 0 05 * * ?")
     public void startZhuDaiReport(){
         if(increment()){
             redisTemplate.expire(Constant.QG_ZHU_DAI_REPORT_LOCK_KEY, 10, TimeUnit.SECONDS);
@@ -54,6 +54,7 @@ public class QuantGroupZhuDaiReportToBaiHang {
             Stopwatch stopwatch = Stopwatch.createStarted();
 
             boolean tableIsSyn = synLoanInfoHistoryTask.syn_historyAndplan_by_id();
+
             if(tableIsSyn){
                 try{
                     //yyyy-MM-dd
@@ -63,11 +64,24 @@ public class QuantGroupZhuDaiReportToBaiHang {
                     log.info("量化派-助贷模式报送贷款信息开始, newTime: {} , startnyr: {} , endnyr: {} ", LocalDateTime.now(), startnyr, endnyr);
 
                     String msg_A1 = baiHangZhuDaiService.sendZhuDaiApplyToBaiHang(startnyr,endnyr);  //生产 助贷-贷款申请 报送T+1    暂时先不报送C1 因为百行还没有开放查询接口
+                    dingTalk.talk("Info","报送"+startnyr+"申请A1结束",msg_A1);
+                    if(msg_A1.indexOf("[false]")!=-1){
+                        dingTalk.talk_ToUser("报送"+startnyr+"申请A1有部分失败,请尽快手动处理!");
+                    }
+
                     String msg_D2 = baiHangZhuDaiService.sendZhuDaiLoanToBaiHang(startnyr,endnyr);        //生产 助贷-放款信息 报送T+1
+                    dingTalk.talk("Info","报送"+startnyr+"放款D2结束",msg_D2);
+                    if(msg_D2.indexOf("[false]")!=-1){
+                        dingTalk.talk_ToUser("报送"+startnyr+"放款D2有部分失败,请尽快手动处理!");
+                    }
+
                     String msg_D3 =baiHangZhuDaiService.sendZhuDaiRepaymentToBaiHang(startnyr,endnyr);      //生产 助贷-还款&逾期信息  报送T+1
+                    dingTalk.talk("Info","报送"+startnyr+"还款D3结束",msg_D3);
+                    if(msg_D3.indexOf("[false]")!=-1){
+                        dingTalk.talk_ToUser("报送"+startnyr+"还款D3有部分失败,请尽快手动处理!");
+                    }
 
                     log.info("量化派-助贷模式报送贷款信息结束, newTime: {}, 耗时: {} , msg: {} ", LocalDateTime.now(), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), (msg_A1 + msg_D2 + msg_D3));
-                    dingTalk.talk("Info","报送贷款信息结束",msg_A1 + msg_D2 + msg_D3);
 
                 }catch (Exception e){
                     log.error("量化派-助贷模式报送贷款信息异常, newTime: {}, 耗时: {} ", LocalDateTime.now(), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), e);

src/main/java/cn/quantgroup/report/job/SynLoanInfoHistoryTask.java

@@ -48,7 +48,7 @@ public class SynLoanInfoHistoryTask {
     private static AtomicBoolean SYN_Stop = new AtomicBoolean(false);
 
     @Async
-    @Scheduled(cron = "0 0 05 * * ?")//2019.11.15 15:25
+    /*@Scheduled(cron = "0 0 05 * * ?")*/  //2019.11.15 15:25
     public void startHistoryDateCopy(){
         if(increment()){
             redisTemplate.expire(Constant.XYQB_HISTORY_DAI_REPORT_LOCK_KEY, 10, TimeUnit.SECONDS);

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

@@ -169,6 +169,7 @@ public class BaiHangZhuDaiService {
      * Scheduled 贷款申请（百行征信报送）
      */
     public String sendZhuDaiApplyToBaiHang(String startnyr, String endnyr) {
+        log.info("量化派助贷TO百行报送T+1申请开始...");
         //yyyy-MM-dd
         Stopwatch queryWatch1 = Stopwatch.createStarted();
         BaiHangTimeRecord timeRecord = BaiHangTimeRecord.builder().startTime(startnyr).endTime(endnyr).build();
@@ -187,7 +188,7 @@ public class BaiHangZhuDaiService {
         }
 
         Stopwatch sendWatch = Stopwatch.createStarted();
-        AtomicInteger atomicInteger = new AtomicInteger();
+        AtomicInteger succ_atomicInteger = new AtomicInteger();
         for (int i = 0; i < applyLoanInfos.size(); i++) {
             String reqId_log = "";
             try {
@@ -207,16 +208,17 @@ public class BaiHangZhuDaiService {
                 if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
                     log.info("量化派助贷TO百行报送-贷款申请返回结果不正确, reqId_log: {} , applyId: {} ", reqId_log, applyLoanInfo.getApplyId());
                 } else {
-                    atomicInteger.getAndIncrement();
+                    succ_atomicInteger.getAndIncrement();
                 }
             } catch (Exception e) {
                 log.error("量化派助贷TO百行报送-贷款申请信息异常, reqId_log: {} ", reqId_log, e);
             }
         }
-        log.info("量化派助贷TO百行报送-贷款申请报送完成, 实际大小: {} , 报送成功大小: {} , 耗时: {} ", applyLoanInfos.size(), atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
+        log.info("量化派助贷TO百行报送-贷款申请报送完成, 实际大小: {} , 报送成功大小: {} , 耗时: {} ", applyLoanInfos.size(), succ_atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
 
-        String resMsgTemp = "申请A1报送: 查询 %d条(联合贷%d条), 报送成功 %d条; ";
-        return String.format(resMsgTemp, applyLoanInfos.size(), (applyLoanInfosLh!=null?applyLoanInfosLh.size():0),atomicInteger.get());
+        String resMsgTemp = "申请报送: 查询 %d条(联合贷%d条), 报送成功 %d条;";
+        resMsgTemp+="["+(applyLoanInfos.size()==succ_atomicInteger.get())+"]";
+        return String.format(resMsgTemp, applyLoanInfos.size(), (applyLoanInfosLh!=null?applyLoanInfosLh.size():0), succ_atomicInteger.get());
     }
 
 
@@ -225,10 +227,13 @@ public class BaiHangZhuDaiService {
      * Scheduled 实时放款数据（百行征信报送）
      */
     public String sendZhuDaiLoanToBaiHang(String startnyr, String endnyr) {
+        log.info("量化派助贷TO百行报送T+1放款开始...");
         //yyyy-MM-dd
         BaiHangTimeRecord timeRecord = BaiHangTimeRecord.builder().startTime(startnyr).endTime(endnyr).build();
 
-        AtomicInteger atomicInteger = new AtomicInteger();
+        AtomicInteger succ_atomicInteger = new AtomicInteger();
+        AtomicInteger save_atomicInteger = new AtomicInteger();
+
         List<LoanInfoZhuDai> loanInfos = new ArrayList<>();
         Stopwatch sendWatch = Stopwatch.createStarted();
         int loanInfosLhSize = 0;
@@ -254,20 +259,19 @@ public class BaiHangZhuDaiService {
                 LoanInfoZhuDai loanInfozd_tmp = loanInfos.get(i);
                 String id = "";
                 try {
-                    String loanInfoReqId = loanInfozd_tmp.getReqID();
+                    String reqId_log = loanInfozd_tmp.getReqID();
                    /* if (loanInfozd_tmp.getTotalTerm() > 1) {
                         List<String> targetRepaymentDayList = loanInfoMapper.findTargetRepaymentDayList(loanInfoReqId);
                         loanInfozd_tmp.setTargetRepayDateList(String.join(",", targetRepaymentDayList));
                     }*/
-                    List<String> targetRepaymentDayList = loanInfoMapper.findTargetRepaymentDayList(loanInfoReqId);
+                    List<String> targetRepaymentDayList = loanInfoMapper.findTargetRepaymentDayList(reqId_log);
                     if(targetRepaymentDayList!=null && targetRepaymentDayList.size()>0){
                         loanInfozd_tmp.setTargetRepayDateList(String.join(",", targetRepaymentDayList));
                         //log.info("比较还款总期数&账单日列表totalTerm="+loanInfozd_tmp.getTotalTerm()+",targetRepaymentDayList size="+targetRepaymentDayList.size());
                     }else{
-                        log.warn("比较还款总期数&账单日列表loanInfoReqId: {} , totalTerm: {} , targetRepaymentDayList is null!", loanInfoReqId, loanInfozd_tmp.getTotalTerm());
+                        log.warn("比较还款总期数&账单日列表reqId_log: {} , totalTerm: {} , targetRepaymentDayList is null!", reqId_log, loanInfozd_tmp.getTotalTerm());
                     }
 
-
                     String relationID = loanInfozd_tmp.getRelationID();
                     if(relationID!=null){
                         if(relationID.length()>36){ //长度[1,36]
@@ -281,7 +285,7 @@ public class BaiHangZhuDaiService {
                                     loanInfozd_tmp.setRelationID("L"+tmp);
                                 }
                             }else{
-                                log.warn("量化派助贷TO百行报送-放款返回结果不正确, 发现其他类型的relationID并且长度大于36, relationID: {} , loanInfoReqId: {} ", relationID, loanInfoReqId);
+                                log.warn("量化派助贷TO百行报送-放款返回结果不正确, 发现其他类型的relationID并且长度大于36, relationID: {} , reqId_log: {} ", relationID, reqId_log);
                                 //continue;
                                 loanInfozd_tmp.setRelationID("X"+relationID.substring(0,35));
                             }
@@ -293,8 +297,9 @@ public class BaiHangZhuDaiService {
                     try{
                         loanInfozd_tmp.setRecordId(id);
                         loanInfoDbMapper.saveLoanInfoRecordLog(loanInfozd_tmp);
+                        save_atomicInteger.getAndIncrement();
                     }catch(Exception e){
-                        log.error("量化派助贷TO百行报送-放款申请保存记录失败, loanInfoReqId: {} , JSON: {} ", loanInfoReqId, JSON.toJSONString(loanInfozd_tmp), e);
+                        log.error("量化派助贷TO百行报送-放款申请保存记录失败, reqId_log: {} , JSON: {} ", reqId_log, JSON.toJSONString(loanInfozd_tmp), e);
                     }
                     loanInfozd_tmp.setRecordId(null);
                     loanInfozd_tmp.setReqID(id);
@@ -311,22 +316,23 @@ public class BaiHangZhuDaiService {
                     String resultStr = iHttpService.postBaiHang(baiHangLoanInfoUrl, getHeader(), JSON.toJSONString(loanInfo));
                     log.info("助贷放款用户报送结果, param: {} , resultStr: {} ", JSON.toJSONString(loanInfo), resultStr);
                     if (Objects.isNull(resultStr) || !"success".equalsIgnoreCase(JSON.parseObject(resultStr).getString("status"))) {
-                        log.info("量化派助贷TO百行报送-放款返回结果不正确, loanInfoReqId:{} , recordId: {} , loanId: {} , bean: {} ", loanInfoReqId, id, loanInfo.getLoanId(), JSON.toJSONString(loanInfo));
+                        log.info("量化派助贷TO百行报送-放款返回结果不正确, reqId_log: {} , recordId: {} , loanId: {} , bean: {} ", reqId_log, id, loanInfo.getLoanId(), JSON.toJSONString(loanInfo));
                         loanInfoDbMapper.updateCurrentRecordEnableFalce(BaiHangUpDateRecord.builder().enable("0").recordId(id).build());
                     } else {
-                        atomicInteger.getAndIncrement();
+                        succ_atomicInteger.getAndIncrement();
                     }
                 } catch (Exception e) {
-                    log.error("量化派助贷TO百行报送-放款信息异常, loanInfoReqId: {} , recordId: {} , loanId: {} ", loanInfozd_tmp.getReqID(), id, loanInfozd_tmp.getLoanId(), e);
+                    log.error("量化派助贷TO百行报送-放款信息异常, reqId: {} , recordId: {} , loanId: {} ", loanInfozd_tmp.getReqID(), id, loanInfozd_tmp.getLoanId(), e);
                 }
             }
         }catch(Exception e){
             log.error("量化派助贷TO百行报送-异常", e);
         }
-        log.info("量化派助贷TO百行报送-放款申请完成, 实际大小: {} , 报送成功大小: {} , 耗时: {} ", loanInfos.size(), atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
+        log.info("量化派助贷TO百行报送-放款申请完成, 实际大小: {} , 报送成功大小: {} , 保存日志: {} , 耗时: {} ", loanInfos.size(), succ_atomicInteger.get(), save_atomicInteger.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
 
-        String resMsgTemp = "放款D2报送: 查询 %d条(联合贷%d条), 报送成功 %d条; ";
-        return String.format(resMsgTemp, loanInfos.size(), loanInfosLhSize, atomicInteger.get());
+        String resMsgTemp = "放款报送:查询 %d条(联合贷%d条), 报送成功 %d条, 存日志 %d条;";
+        resMsgTemp+="["+(loanInfos.size()==succ_atomicInteger.get())+"]";
+        return String.format(resMsgTemp, loanInfos.size(), loanInfosLhSize, succ_atomicInteger.get(), save_atomicInteger.get());
     }
 
 
@@ -335,11 +341,12 @@ public class BaiHangZhuDaiService {
      * Scheduled 还款&逾期（百行征信报送）
      */
     public String sendZhuDaiRepaymentToBaiHang(String startnyr, String endnyr) {
+        log.info("量化派助贷TO百行报送T+1还款&逾期开始...");
         //yyyy-MM-dd
         BaiHangTimeRecord timeRecord = BaiHangTimeRecord.builder().startTime(startnyr).endTime(endnyr).build();
         String resMsg = "";
-        String temp_huanKuan = "还款D3报送: 查询 %d条(联合贷%d条), 实际 %d条, 跳过 %d条, 报送成功 %d条; ";
-        String temp_yuQi = "逾期D3报送: 查询 %d条(联合贷%d条), 实际 %d条, 跳过 %d条, 报送成功 %d条; ";
+        String temp_huanKuan = "还款报送:查询 %d条(联合贷%d条), 实际 %d条, 跳过 %d条, 报送成功 %d条, 存日志 %条;";
+        String temp_yuQi = "逾期报送:查询 %d条(联合贷%d条), 实际 %d条, 跳过 %d条, 报送成功 %d条, 存日志 %条;";
 
         for (int j = 0; j < 2; j++) {
             Stopwatch sendWatch = Stopwatch.createStarted();
@@ -373,9 +380,11 @@ public class BaiHangZhuDaiService {
                     repaymentLoanInfos.addAll(repaymentLoanInfosLh);
                 }
 
-                AtomicInteger succ_atomicInt= new AtomicInteger();
+
                 AtomicInteger totail_atomicInt = new AtomicInteger();
                 AtomicInteger tg_atomicInt = new AtomicInteger();
+                AtomicInteger succ_atomicInt= new AtomicInteger();
+                AtomicInteger saveLog_atomicInt= new AtomicInteger();
                 for (int i = 0; i < repaymentLoanInfos.size(); i++) {
                     RepaymentInfoZhuDai repaymentLoanInfo = repaymentLoanInfos.get(i);
                     String id = "";
@@ -393,6 +402,7 @@ public class BaiHangZhuDaiService {
                         try {
                             repaymentLoanInfo.setRecordId(id);
                             repaymentLoanInfoDbMapper.saveRepaymentLoanInfoLog(repaymentLoanInfo);
+                            saveLog_atomicInt.getAndIncrement();
                         } catch (Exception e) {
                             log.error("量化派助贷TO百行报送-实时还款保存记录异常, reqId_log: {} , loanId: {} , termNo: {} , JSON: {} ", reqId_log, repaymentLoanInfo.getLoanId(), repaymentLoanInfo.getTermNo(), JSON.toJSONString(repaymentLoanInfo), e);
                         }
@@ -417,12 +427,13 @@ public class BaiHangZhuDaiService {
                 }
 
                 if (j == 0) {
-                    resMsg+=String.format(temp_huanKuan, repaymentLoanInfos.size(), (repaymentLoanInfosLh!=null ? repaymentLoanInfosLh.size() : 0), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get());
+                    resMsg+=String.format(temp_huanKuan, repaymentLoanInfos.size(), (repaymentLoanInfosLh!=null ? repaymentLoanInfosLh.size() : 0), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get(), saveLog_atomicInt.get());
                 }else{
-                    resMsg+=String.format(temp_yuQi, repaymentLoanInfos.size(), (repaymentLoanInfosLh!=null ? repaymentLoanInfosLh.size() : 0), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get());
+                    resMsg+=String.format(temp_yuQi, repaymentLoanInfos.size(), (repaymentLoanInfosLh!=null ? repaymentLoanInfosLh.size() : 0), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get(), saveLog_atomicInt.get());
                 }
+                resMsg+="["+ (totail_atomicInt.get()==succ_atomicInt.get())+"]";
 
-                log.info("量化派助贷TO百行报送-还款申请完成 J: {} , 开始时间: {} , 结束时间: {} , list大小: {} , 实际大小: {} , 跳过: {} , 报送成功大小: {} , 耗时: {} ", j, startnyr, endnyr, repaymentLoanInfos.size(), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
+                log.info("量化派助贷TO百行报送-还款申请完成 J: {} , 开始时间: {} , 结束时间: {} , list大小: {} , 实际大小: {} , 跳过: {} , 报送成功大小: {} , 保存日志: {} , 耗时: {} ", j, startnyr, endnyr, repaymentLoanInfos.size(), totail_atomicInt.get(), tg_atomicInt.get(), succ_atomicInt.get(), saveLog_atomicInt.get(), (sendWatch.stop().elapsed(TimeUnit.MILLISECONDS)/1000)+".s");
             } catch (Exception e) {
                 log.error("量化派助贷TO百行报送-异常 J: {} , 开始时间: {} , 结束时间: {} ", j, startnyr, endnyr, e);
             }

src/main/java/cn/quantgroup/report/service/manualTool/ManualToolService.java

@@ -2510,6 +2510,49 @@ public class ManualToolService implements CommonSuperService {
     }
 
 
+    private static void build_d2_1226() {
+        try{
+            List<String> d2JsonList = ReadOrWriteTxt.readTxtList("D:\\用户目录\\Downloads\\日增日志\\log_d2_26.txt");
+            log.info("files d2JsonList size="+d2JsonList.size());
+
+            for(int i=0; i<d2JsonList.size(); i++){
+                String jsonStr = d2JsonList.get(i);
+                if(jsonStr.length()<30){
+                    continue;
+                }
+                //LoanInfoZhuDaiVo loanInfo
+                /*JSONObject jsonObject = JSONObject.parseObject(jsonStr);
+                jsonObject.put("recordId",jsonObject.getString("reqID"));
+                jsonObject.remove("reqID");*/
+
+                LoanInfoZhuDaiVo loanInfo = JSONObject.parseObject(jsonStr, LoanInfoZhuDaiVo.class);
+                FinTechAgencyBusinessZhuDai finTechAgencyBusiness = JSONObject.parseObject(jsonStr, FinTechAgencyBusinessZhuDai.class);
+                loanInfo.setFinTechAgencyBusiness(finTechAgencyBusiness);
+
+                /*loanInfo.setRecordId(loanInfo.getReqID());
+                loanInfo.setReqID(null);*/
+
+
+
+                FileUtils.write(new File("D:\\用户目录\\Downloads\\日增日志\\log2_d2_26.txt"), JSON.toJSONString(loanInfo)+"\n", "UTF-8", true);
+
+                /*LoanInfoZhuDai loanInfozd_tmp = JSONObject.parseObject(jsonStr, LoanInfoZhuDai.class);
+                int totalTerm = jsonObject.getInteger("totalTerm");
+                String targetRepayDateList = jsonObject.getString("targetRepayDateList");
+                if(targetRepayDateList.split(",").length == totalTerm){
+                    FileUtils.write(new File("D:\\用户目录\\Downloads\\ok_d2.txt"), jsonStr+"\n", "UTF-8", true);
+                }else{
+                    log.error(jsonObject.getString("loanId") + "," + targetRepayDateList.split(",").length + "," + totalTerm);
+                    FileUtils.write(new File("D:\\用户目录\\Downloads\\err_d2.txt"), jsonStr+"\n", "UTF-8", true);
+                }*/
+            }
+            log.info("All D2 LOG:保存放款记录结束");
+        }catch (Exception e){
+            log.error("处理放款记录异常！", e);
+        }
+    }
+
+
 
 
 
@@ -2578,7 +2621,9 @@ public class ManualToolService implements CommonSuperService {
 
             //check_d2();
 
-        build_reqID_recordId();
+       // build_reqID_recordId();
+
+        build_d2_1226();
     }