手动报送工具优化。

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

@@ -77,8 +77,8 @@ public class ManualToolService implements CommonSuperService {
 
 
     private ShellUtils executeCommand = null;
-    private static final String P1_48MD5_01 = "92db79819d81523604a8ee5da9142167f38766bb2cd32f0c";//127.
-    private static final String P1_48MD5_02 = "21696578a624218b5237713fd0a79ab2168a458217801b0b";//172.21.10.8
+    private static final String P1_48MD5_01 = "120a97b4b73c440413933351a2db2512fc7698f157b5c60d";
+    private static final String P1_48MD5_02 = "85b61d877f6ce41c4cc72413f6766ae6876405f06b607b02";
     private static final String P2_48MD5 = "d4893490905d534e6fc1512ba6619d14df8c312362589342";
     private static final String P3_48MD5 = "57971a003213360c6fa09f4b257d5eb5441ba97a5450aa63";
 
@@ -224,6 +224,9 @@ public class ManualToolService implements CommonSuperService {
                         for (RepaymentLoanInfoLog logBean : tmpLogList) {
                             RepaymentInfoZhuDai voBean = new RepaymentInfoZhuDai();
 
+                            //查询d2使用
+                            loanIdList.add(voBean.getLoanId());
+
                             //添加了忽略username属性的赋值
                             //BeanUtils.copyProperties(book,book2,"username");
                             BeanUtils.copyProperties(logBean, voBean);
@@ -231,10 +234,6 @@ public class ManualToolService implements CommonSuperService {
                             if (voBean.getOverdueStatus() == null) {
                                 voBean.setOverdueStatus("");
                             }
-                            voBean.setReqID(logBean.getRecordId());
-
-                            loanIdList.add(voBean.getLoanId());
-
                             repaymentLoanInfoList.add(voBean);
                         }
 
@@ -255,7 +254,7 @@ public class ManualToolService implements CommonSuperService {
 
 
                     if (loanIdList.size() > 0) {//放款D2 及 申请A1
-                        List<LoanInfoZhuDaiVo> loanInfoVoList = new ArrayList<LoanInfoZhuDaiVo>();
+                        List<LoanInfoZhuDai> loanInfoVoList = new ArrayList<LoanInfoZhuDai>();
 
                         String[] orderNoArray = loanIdList.toArray(new String[loanIdList.size()]);
                         List<String> loanApplicationHistoryIdList = loanInfoMapper.findHistoryIdByOrderNo(orderNoArray);
@@ -263,20 +262,15 @@ public class ManualToolService implements CommonSuperService {
                         //查询D2
                         for (String historyId : loanApplicationHistoryIdList) {
                             LoanInfoZhuDai loanInfozd_tmp = loanInfoMapper.findLoanInfoD2ByHistoryId(historyId);
-                            String jsonStr = JSONObject.toJSONString(loanInfozd_tmp);
-
-                            LoanInfoZhuDaiVo loanInfoZhuDaiVo = JSONObject.parseObject(jsonStr, LoanInfoZhuDaiVo.class);
-                            FinTechAgencyBusinessZhuDai finTechAgencyBusiness = JSONObject.parseObject(jsonStr, FinTechAgencyBusinessZhuDai.class);
-                            loanInfoZhuDaiVo.setFinTechAgencyBusiness(finTechAgencyBusiness);
-
-                            loanInfoVoList.add(loanInfoZhuDaiVo);
+                            //TargetRepayDateList报送时会查
+                            loanInfoVoList.add(loanInfozd_tmp);
                         }
                         resultMsg.append("|");
                         resultMsg.append("D2 List size=" + loanInfoVoList.size());
 
                         if (loanInfoVoList.size() > 0) {
                             boolean lengthIs0 = (json_fk_D2.length()==0);
-                            for (LoanInfoZhuDaiVo vo : loanInfoVoList){
+                            for (LoanInfoZhuDai vo : loanInfoVoList){
                                 if(lengthIs0){
                                     lengthIs0 = false;
                                     json_fk_D2.append(JSONObject.toJSONString(vo));
@@ -3239,7 +3233,7 @@ public class ManualToolService implements CommonSuperService {
 
 
 
-    public static void main(String[] args) {
+    public static void main33(String[] args) {
 //        List<String> lineList = ReadOrWriteTxt.readTxtList("D:\\用户目录\\Downloads\\D2_M_01.txt");
 //        System.out.println("lineList:"+lineList.size());
 //        StringBuffer buff = new StringBuffer();
@@ -3330,4 +3324,6 @@ public class ManualToolService implements CommonSuperService {
 
 
 
+
+
 }