修改月还计提、生成还款计划表

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -149,6 +149,12 @@ public interface BusSalesOrderVehicleFeign {
     @ResponseBody
     ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid);
 
+    @ApiOperation("根据销售订单sid和贷款人sid和贷款合同sid查车辆信息")
+    @PostMapping("/selectListByOrderSidAndDkrSidAndLoanContractSid")
+    @ResponseBody
+    ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid);
+
+
     @ApiOperation("根据销售订单sid和消贷合同sid查车辆信息")
     @PostMapping("/selectListByOrderSidAndXdConSid")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -143,6 +143,11 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid, String loanContractSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndXdConSid(String saleOrderSid, String loanContractSid) {
         return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -165,6 +165,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
 
     List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
+    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid,@Param("loanContractSid") String loanContractSid);
 
     List<String> selectVinNos(@Param("borrowSid") String sid, @Param("saleOrderSid") String saleOrderSid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -375,6 +375,14 @@
         WHERE salesOrderSid = #{saleOrderSid}
           AND borrowerSid = #{borrowerSid}
     </select>
+    <select id="selectListByOrderSidAndDkrSidAndLoanContractSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        SELECT *
+        FROM bus_sales_order_vehicle
+        WHERE salesOrderSid = #{saleOrderSid}
+          AND borrowerSid = #{borrowerSid}
+          AND loanContractSid = #{loanContractSid}
+    </select>
 
     <select id="selectVinNos" resultType="java.lang.String">
         select

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -160,6 +160,14 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return rb.success().setData(busSalesOrderVehicles);
     }
 
+
+    @Override
+    public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid,String loanContractSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectListByOrderSidAndDkrSidAndLoanContractSid(saleOrderSid, borrowerSid,loanContractSid);
+        return rb.success().setData(busSalesOrderVehicles);
+    }
+
     @Override
     public ResultBean<List<BusSalesOrderVehicle>> selectListByOrderSidAndXdConSid(String saleOrderSid, String loanContractSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -631,7 +631,9 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(String saleOrderSid, String borrowerSid) {
         return baseMapper.selectListByOrderSidAndDkrSid(saleOrderSid, borrowerSid);
     }
-
+    public List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(String saleOrderSid, String borrowerSid,String loanContractSid) {
+        return baseMapper.selectListByOrderSidAndDkrSidAndLoanContractSid(saleOrderSid, borrowerSid,loanContractSid);
+    }
     public List<String> selectVinNos(String sid, String saleOrderSid) {
         return baseMapper.selectVinNos(sid, saleOrderSid);
     }

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

@@ -48,20 +48,20 @@ public class VoucherService extends FinKingDeeService {
         }
         String kingDeeData = VoucherCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
         try {
-
-            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
+            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+            if (!resultBean1.getSuccess()) {
+                log.info("凭证暂存失败!");
+                return rb.setMsg("凭证暂存失败!");
+            }
+            log.info("凭证暂存成功!");
+            ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.SAVE_URL.getURL());
             if (!resultBean1.getSuccess()) {
                 log.info("凭证保存失败!");
                 return rb.setMsg("凭证保存失败!");
             }
             log.info("凭证保存成功!");
 
-//            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.GL_VOUCHER.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
-//            if (!resultBean1.getSuccess()) {
-//                log.info("凭证暂存失败!");
-//                return rb.setMsg("凭证暂存失败!");
-//            }
-//            log.info("凭证暂存成功!");
+
 //            String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
 //            ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
 //            if (!resultBean2.getSuccess()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -664,38 +664,52 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
     private void pushAccrualVoucher(String businessSid) {
         List<LoanMonthlyAccrualRecord> records = loanMonthlyAccrualRecordService.selByMainSid(businessSid);
         if (!records.isEmpty()) {
-            GeneralVoucher generalVoucher = new GeneralVoucher();
-            List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
-            for (LoanMonthlyAccrualRecord v : records) {
-                LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();
-                if (null != planDetails) {
-                    String useOrgSid = planDetails.getUseOrgSid();
-                    SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
-                    if (null != organizationVo) {
-                        generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
-                    }
-                    GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                    String scheduleSid = planDetails.getScheduleSid();
-                    LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
-                    if (null != repaymentSchedule) {
-                        if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
-                            voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
-                        }
-                    }
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
-                        if (null != busSalesOrderVehicle) {
-                            String customerNumber = "";
-                            if (StringUtils.isNotBlank(busSalesOrderVehicle.getTemporaryNo())) {
-                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
+            int index = 100;
+            for (int i = 0; i < records.size(); i += 100) {
+                if (i + 100 > records.size()) {
+                    index = records.size() - i;
+                }
+                List<LoanMonthlyAccrualRecord> newList = records.subList(i, i + index);
+                if (!newList.isEmpty()) {
+                    GeneralVoucher generalVoucher = new GeneralVoucher();
+                    List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
+                    for (LoanMonthlyAccrualRecord v : newList) {
+                        LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData();
+                        if (null != planDetails) {
+                            String useOrgSid = planDetails.getUseOrgSid();
+                            SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+                            if (null != organizationVo) {
+                                generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
+                            }
+                            GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
+                            String scheduleSid = planDetails.getScheduleSid();
+                            LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+                            if (null != repaymentSchedule) {
+                                if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
+                                    voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+                                }
                             }
-                            voucherDetail.setCustomerCode(customerNumber);
+                            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+                            if (null != busSalesOrderVehicle) {
+                                String customerNumber = "";
+                                if (StringUtils.isNotBlank(busSalesOrderVehicle.getTemporaryNo())) {
+                                    customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                                }
+                                voucherDetail.setCustomerCode(customerNumber);
+                            }
+                            voucherDetail.setAmount(planDetails.getDueMoney());
+                            voucherDetails.add(voucherDetail);
                         }
-                    voucherDetail.setAmount(planDetails.getDueMoney());
-                    voucherDetails.add(voucherDetail);
+                    }
+                    generalVoucher.setVoucherDetails(voucherDetails);
+                    try {
+                        finKingDeeFeign.saveAccrualVoucher(generalVoucher);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
                 }
             }
-            generalVoucher.setVoucherDetails(voucherDetails);
-            finKingDeeFeign.saveAccrualVoucher(generalVoucher);
         }
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -581,7 +581,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
                             otherBankNo = scheduleDetails.getOtherBankNo();
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (int j = 0; j < vehicles.size(); j++) {
                                 BusSalesOrderVehicle vehicle = vehicles.get(j);
@@ -790,7 +790,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 bankContractNo = loancontractVo.getBankContractNo();
                             }
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (int j = 0; j < vehicles.size(); j++) {
                                 BusSalesOrderVehicle vehicle = vehicles.get(j);
@@ -969,7 +969,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
                             otherBankNo = scheduleDetails.getOtherBankNo();
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (BusSalesOrderVehicle vehicle : vehicles) {
                                 String linkNo = vehicle.getLinkNo();
@@ -1145,7 +1145,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 bankContractNo = loancontractVo.getBankContractNo();
                             }
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (BusSalesOrderVehicle vehicle : vehicles) {
                                 String linkNo = vehicle.getLinkNo();
@@ -1390,7 +1390,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
                             otherBankNo = scheduleDetails.getOtherBankNo();
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (int j = 0; j < vehicles.size(); j++) {
                                 BusSalesOrderVehicle vehicle = vehicles.get(j);
@@ -1598,7 +1598,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 bankContractNo = loancontractVo.getBankContractNo();
                             }
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (int j = 0; j < vehicles.size(); j++) {
                                 BusSalesOrderVehicle vehicle = vehicles.get(j);
@@ -1776,7 +1776,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(scheduleDetails.getOtherBankNo())) {
                             otherBankNo = scheduleDetails.getOtherBankNo();
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (BusSalesOrderVehicle vehicle : vehicles) {
                                 String linkNo = vehicle.getLinkNo();
@@ -1951,7 +1951,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                                 bankContractNo = loancontractVo.getBankContractNo();
                             }
                         }
-                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(salesOrderSid, borrowerSid).getData();
+                        List<BusSalesOrderVehicle> vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSidAndLoanContractSid(salesOrderSid, borrowerSid,loanContractSid).getData();
                         if (!vehicles.isEmpty()) {
                             for (BusSalesOrderVehicle vehicle : vehicles) {
                                 String linkNo = vehicle.getLinkNo();