修改推送凭证

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -590,6 +590,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         resultDetails.add(dto2);
                         decimal = decimal.add(voucherDetail.getAmount());
                     } else if (payCostTitleValue.equals("名义价")) {
+                        if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("结清名义价款");
                             dto2.setSubjectNo(bankCode);
@@ -597,6 +598,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
                             resultDetails.add(dto2);
+                            decimal = decimal.add(voucherDetail.getSubtrahend());
+                        }
                         if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto3.setSummary("结清名义价款差额转收入");
@@ -606,8 +609,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             resultDetails.add(dto3);
                             decimal = decimal.add(voucherDetail.getBalance());
                         }
-                        decimal = decimal.add(voucherDetail.getSubtrahend());
                     } else if (payCostTitleValue.equals("合同违约金")) {
+                        if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-合同违约金");
                             dto2.setSubjectNo(bankCode);
@@ -615,6 +618,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
                             resultDetails.add(dto2);
+                            decimal = decimal.add(voucherDetail.getSubtrahend());
+                        }
                         if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto3.setSummary("其他费用差额转收入");
@@ -624,8 +629,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             resultDetails.add(dto3);
                             decimal = decimal.add(voucherDetail.getBalance());
                         }
-                        decimal = decimal.add(voucherDetail.getSubtrahend());
                     } else if (payCostTitleValue.equals("其他费用")) {
+                        if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-资方其他费用");
                             dto2.setSubjectNo(bankCode);
@@ -633,6 +638,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
                             resultDetails.add(dto2);
+                            decimal = decimal.add(voucherDetail.getSubtrahend());
+                        }
                         if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto3.setSummary("收其他费用");
@@ -643,7 +650,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             resultDetails.add(dto3);
                             decimal = decimal.add(voucherDetail.getBalance());
                         }
-                        decimal = decimal.add(voucherDetail.getSubtrahend());
                     } else if (payCostTitleValue.equals("资方退还垫款")) {
                         check = 1;
                         Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -199,6 +199,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanSolutionsService loanSolutionsService;
+
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
         LoanSettleApplyQuery query = pq.getParams();
         QueryWrapper<LoanSettleApply> qw = new QueryWrapper<>();
@@ -1641,7 +1642,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
         GeneralVoucher generalVoucher = new GeneralVoucher();
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
-        LoanRepaymentPlanDetails planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
         if (null != planDetails) {
             String useOrgSid = planDetails.getUseOrgSid();
             SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -1650,12 +1656,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             }
             String deptCode = "";
             String customerNumber = "";
-            String scheduleSid = planDetails.getScheduleSid();
+            if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
-            LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+                deptCode = schedule.getCwDeptNo();
-            if (null != repaymentSchedule) {
-                if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
-                    deptCode = repaymentSchedule.getCwDeptNo();
-                }
             }
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
             BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
@@ -3331,7 +3333,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 paymentVoucher.setBankAccount(accountNumber);
                 paymentVoucher.setPayTypeCode(payTypeCode);
                 List<PaymentVoucher.PaymentVoucherDetail> voucherDetails = new ArrayList<>();
-                LoanRepaymentPlanDetails planDetails = baseMapper.selectMainPeriodByBusVinSid(apply.getBusVinSid());
+                LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(apply.getBusVinSid());
+                String scheduleSid = planDetails.getScheduleSid();
+                LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+                if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+                    planDetails = baseMapper.selectMainPeriodByBusVinSid(apply.getBusVinSid());
+                }
                 if (null != planDetails) {
                     PaymentVoucher.PaymentVoucherDetail voucherDetail = new PaymentVoucher.PaymentVoucherDetail();
                     if (topping == 1) {
@@ -3351,7 +3358,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     if (null != organizationVo) {
                         paymentVoucher.setUseOrgCode(organizationVo.getOrgCode());
                     }
-                    LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
                     if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
                         voucherDetail.setDeptCode(schedule.getCwDeptNo());
                     }