From af9588c33d0865b6ecece20e1a0743583baafc08 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 2 Jan 2024 17:30:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E8=BF=98=E8=AE=A1=E6=8F=90=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=87=AD=E8=AF=81=E3=80=81=E8=BD=AC=E4=BB=98=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E6=8E=A8=E9=80=81=E8=BD=AC=E4=BB=98=E6=9C=88=E8=BF=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 160 ++++++++---------- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 6 +- .../biz/kingdee/voucher/VoucherService.java | 20 ++- .../LoanMonthlyAccrualApplyService.java | 35 +++- .../LoanTransferPaymentApplyService.java | 16 ++ 5 files changed, 137 insertions(+), 100 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 97fd6cc7a4..b9a2d6e5b4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -112,6 +112,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; import java.util.function.Predicate; @@ -3684,7 +3686,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService= 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(collDate); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); } loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); } @@ -3740,86 +3759,33 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } else { BigDecimal paymentMoney = planDetails.getPaymentMoney(); String subscriptionMoney = v.getSubscriptionMoney(); BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); planDetails.setPaymentMoney(subtract); loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + if (loanFinBank.getReAdvances() == 1) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(sid).getData(); + jr.setCreateByName(userVo.getName()); + jr.setBusSid(planSid); + jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setPayCostTitleKey("007"); + jr.setPayCostTitleValue("资方退还垫款"); + jr.setOrgSidPath(planDetails.getOrgSidPath()); + jr.setUseOrgName(planDetails.getUseOrgName()); + jr.setUseOrgSid(planDetails.getUseOrgSid()); + jr.setStaffDeptName(planDetails.getDept()); + jr.setStaffName(planDetails.getStaffName()); + jr.setStaffDeptSid(planDetails.getDeptSid()); + jr.setStaffUserSid(planDetails.getSalesUserSid()); + finUncollectedReceivablesDetailedJRService.insert(jr); } } } - } else { - LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); - historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); - historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); - historyEntity.setActualDate(new DateTime()); - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - Date dueDate = planDetails.getDueDate(); - if (new Date().compareTo(dueDate) > 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - - } - } else { - LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); - historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); - historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); - historyEntity.setActualDate(new DateTime()); - historyEntity.setReturnWay("间还"); - historyEntity.setReturnWayKey("02"); - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - Date dueDate = planDetails.getDueDate(); - if (new Date().compareTo(dueDate) > 0) { - historyEntity.setPrepareDate(new DateTime()); - } else { - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(dueDate); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); } - historyEntity.setPrepareDate(new DateTime()); - historyEntity.setPlanDetailSid(planSid); - historyEntity.setScheduleSid(planDetails.getScheduleSid()); - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } - } } }); @@ -4098,8 +4064,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = orgPath; @@ -683,9 +688,33 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); if (!records.isEmpty()) { - - - + for (LoanMonthlyAccrualRecord v : records) { + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData(); + if (null != planDetails) { + GeneralVoucher generalVoucher = new GeneralVoucher(); + List voucherDetails = new ArrayList<>(); + String useOrgSid = planDetails.getUseOrgSid(); + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + if (null != organizationVo) { + generalVoucher.setUseOrgCode(organizationVo.getOrgCode()); + } + String deptSid = planDetails.getDeptSid(); + GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); + SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); + if (null != organizationDeptVo) { + voucherDetail.setDeptCode(organizationDeptVo.getOrgCode()); + } + String busVinSid = planDetails.getBusVinSid(); + BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); + if (null != orderVehicle) { + voucherDetail.setCustomerCode(orderVehicle.getTemporaryNo()); + } + voucherDetail.setAmount(planDetails.getDueMoney()); + voucherDetails.add(voucherDetail); + generalVoucher.setVoucherDetails(voucherDetails); + finKingDeeFeign.saveAccrualVoucher(generalVoucher); + } + } } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 757d7e98f1..5c4cf98d63 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -53,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -591,6 +592,21 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService