Merge remote-tracking branch 'origin/master'

src/main/java/com/jqtx/windows/command/BackedCommand.java

@@ -103,17 +103,11 @@ public class BackedCommand extends AbstractCommand {
 
         planList = loanPlanComponent.getByLoan(loanNo);
         LoanModel loanModel = loanComponent.getByLoanNo(loanNo);
-
-        List<LoanPlanModel> overduedList = planList.stream().filter(i -> i.getStatus() == DebtPlanStatusEnum.OVERDUED.getCode()).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(overduedList)) {
-            loanModel.setLoanStatus(DebtInfoStatusEnum.OVERDUED.getCode());
-        } else {
         //存在还款中计划改为还款中
-            List<LoanPlanModel> backingList = planList.stream().filter(i -> i.getStatus() == DebtPlanStatusEnum.SETTLED.getCode()).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(backingList)) {
+        List<LoanPlanModel> backingList = planList.stream().filter(i -> i.getStatus() == DebtPlanStatusEnum.BACKING.getCode()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(backingList)) {
             loanModel.setLoanStatus(DebtInfoStatusEnum.SETTLED.getCode());
         }
-        }
         if (IsSettleEnum.ONE.getCode().equals(backedRequest.getIsSettle())) {
             loanModel.setLoanStatus(DebtPlanStatusEnum.SETTLED.getCode());
         }

src/main/java/com/jqtx/windows/job/BackedBurdenJob.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -64,9 +65,8 @@ public class BackedBurdenJob {
         if (sftp.isDir("/download/assurance/" + date)) {
             sftp.cd("/download/assurance/" + date);
             sftp.get("assurance_" + date + ".txt", "/assurance_sftp.txt");
-            ossUtils.ossUpload("ZN/assurance_/" + "assurance_" + date + ".txt", FileUtil.file("/assurance_sftp.txt"));
-            FileUtil.del("/assurance_sftp.txt");
-            String stringObject = ossUtils.getStringObject("ZN/assurance_/" + "assurance_" + date + ".txt");
+            ossUtils.ossUpload("ZN/assurance/" + "assurance_" + date + ".txt", FileUtil.file("/assurance_sftp.txt"));
+            String stringObject = getStringObject("ZN/assurance/" + "assurance_" + date + ".txt");
             log.info("oss融担数据:{}", stringObject);
             //存储并去平账
             List<BurdenModel> getlist = getlist(stringObject);
@@ -74,12 +74,23 @@ public class BackedBurdenJob {
                 backedBurdenComponent.insert(model);
                 backedBurden(model);
             }
+            FileUtil.del("/assurance_sftp.txt");
         } else {
             log.info("浙农融担文件不存在:{}", date);
         }
 
     }
 
+    public String getStringObject(String uri) {
+        byte[] bytes = new byte[0];
+        try {
+            bytes = ossUtils.ossDownLoad(uri);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new String(bytes);
+    }
+
 
     /**
      * 组装还融担的全部model
@@ -130,15 +141,15 @@ public class BackedBurdenJob {
         String refundNo = SnowSequenceHelper.nextSequence(SnowSequenceHelper.REFUND_NO);
         //生成 windows_repay 信息
         RepayModel repayModel = creditRepay(model, refundNo);
+        loanRepayComponent.insert(repayModel);
         //生成 windows_backed_detail 信息
         BackedDetailModel backedDetailModel = creditBackedDetailModel(model, refundNo);
+        backedDetailComponent.insert(backedDetailModel);
         //修改 windows_plan backAmt 信息 还款状态
         upWindowsPlan(model);
         //修改 windows_loan 还款状态
         LoanModel loanModel = loanComponent.getByLoanNo(model.getLoanNo());
         upWindowsLoan(loanModel);
-        loanRepayComponent.insert(repayModel);
-        backedDetailComponent.insert(backedDetailModel);
     }
 
     /**
@@ -199,7 +210,7 @@ public class BackedBurdenJob {
         planModel.setBackedBurden(new BigDecimal(model.getPepayBurden()));
         BigDecimal planAmt = planModel.getPlanBen().add(planModel.getPlanXi()).add(planModel.getPlanFu()).add(planModel.getPlanFa()).add(planModel.getPlanBurden());
         BigDecimal backedAmt = planModel.getBackedBen().add(planModel.getBackedXi()).add(planModel.getBackedFu()).add(planModel.getBackedFa()).add(planModel.getBackedBurden());
-        if (planAmt.compareTo(backedAmt) == 0) {
+        if (!(planAmt.compareTo(backedAmt) > 0)) {
             planModel.setStatus(LoanStatusEnum.SETTLED.getCode());
         }
         loanPlanComponent.updateByLoanPlanModel(planModel);
@@ -207,18 +218,17 @@ public class BackedBurdenJob {
 
     private void upWindowsLoan(LoanModel loanModel) {
         List<LoanPlanModel> planList = loanPlanComponent.getByLoan(loanModel.getLoanNo());
-        List<LoanPlanModel> overduedList = planList.stream().filter(i -> i.getStatus() == DebtPlanStatusEnum.OVERDUED.getCode()).collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(overduedList)) {
-            loanModel.setLoanStatus(DebtInfoStatusEnum.OVERDUED.getCode());
-        } else {
         //存在还款中计划改为还款中
         List<LoanPlanModel> backingList = planList.stream().filter(i -> i.getStatus() == DebtPlanStatusEnum.BACKING.getCode()).collect(Collectors.toList());
-            if (CollectionUtils.isNotEmpty(backingList)) {
+        if (CollectionUtils.isEmpty(backingList)) {
             loanModel.setLoanStatus(DebtInfoStatusEnum.SETTLED.getCode());
         }
-        }
         //修改 windows_loan 还款状态
         loanComponent.updateByLoanNo(loanModel);
     }
 
+    public static void main(String[] args) {
+
+    }
+
 }

src/main/java/com/jqtx/windows/job/RedeemJob.java

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -45,16 +46,27 @@ public class RedeemJob {
             sftp.cd("/download/compensatory/" + date);
             sftp.get("compensatory_" + date + ".txt", "/compensatory_sftp.txt");
             ossUtils.ossUpload("ZN/compensatory/" + "compensatory_" + date + ".txt", FileUtil.file("/compensatory_sftp.txt"));
-            FileUtil.del("/compensatory_sftp.txt");
-            String stringObject = ossUtils.getStringObject("ZN/compensatory/" + "compensatory_" + date + ".txt");
+            String stringObject = getStringObject("ZN/compensatory/" + "compensatory_" + date + ".txt");
             log.info("oss代偿数据:{}", stringObject);
             redeemComponent.insert(getlist(stringObject));
+            FileUtil.del("/compensatory_sftp.txt");
         } else {
             log.info("浙农代偿文件不存在:{}", date);
         }
 
     }
 
+
+    public String getStringObject(String uri) {
+        byte[] bytes = new byte[0];
+        try {
+            bytes = ossUtils.ossDownLoad(uri);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new String(bytes);
+    }
+
     /**
      * 封装model
      *