diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index 7be4f6fbba..f4ee8c02e3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -521,8 +521,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); if (!resultBean1.getSuccess()) { return rb.setMsg("验车业务模块的数据推送失败!"); @@ -569,14 +567,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); String contractNo = entity.getContractNo(); - BigDecimal oneBillMoney = entity.getOneBillMoney(); - if (oneBillMoney != null) { - entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); + BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); + SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData(); + BigDecimal oneBillMoney = new BigDecimal("0"); + if ("2".equals(entity.getSaleTypeKey())){ + oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount()); + entity.setOneBillMoney(oneBillMoney); + entity.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size()))); + entity.setOpenTickTypeKey(busSalesOrder.getBillingTypeKey()); + entity.setOpenTickTypeValue(busSalesOrder.getBillingType()); + }else { + oneBillMoney = entity.getOneBillMoney(); + if (oneBillMoney != null) { + entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); + } } FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); - BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); vo.setBusSalesOrderSid(busSalesOrder.getSid()); if (finBillVehicleVos != null) { for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { @@ -1027,6 +1049,29 @@ public class FinBillApplicationService extends MybatisBaseService clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); finBillVehicleVo.setCertificatePhoto(clhgeImages); } + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData(); + if ("2".equals(entity.getSaleTypeKey())){ + if ("01".equals(busSalesOrder.getFinancePlan())){//担保 + String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData(); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData(); + finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey()); + finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType()); + if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){ + finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName()); + }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){ + finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()); + } + }else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保 + LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData(); + finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey()); + finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType()); + if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){ + finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName()); + }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){ + finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()); + } + } + } } } vo.setFinBillVehicles(finBillVehicleVos); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index cd09974591..be0f4db9a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -222,4 +222,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/selIsCompanyBuy") @ResponseBody ResultBean selIsCompanyBuy(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("根据销售订单sid和贷款人sid查询家访考察sid") + @PostMapping("/selSaleOrderSidAndBorrSid") + @ResponseBody + ResultBean selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index fb016b494f..15a245df93 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -215,4 +215,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean selIsCompanyBuy(String orderSid, String borrowerSid) { return null; } + + @Override + public ResultBean selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java index dccfa1112f..691595baf9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java @@ -27,4 +27,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi public ResultBean rePush(String salesOrderSid) { return null; } + + @Override + public ResultBean selByBorrSid(String borrowerSid) { + return null; + } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java index f14f6c936f..5c65100214 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java @@ -41,4 +41,7 @@ public interface LoanNoGuaranteeCreditReviewFeign { @PostMapping("/rePush") public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid); + @ApiOperation("根据贷款人sid查询") + @PostMapping("/selByBorrSid") + ResultBean selByBorrSid(@RequestParam("borrowerSid") String borrowerSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index ad85e307e2..a8e11b3385 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -95,4 +95,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper selIsCompanyBuy(String orderSid, String borrowerSid) { return loanHomevisitInvestigateService.selIsCompanyBuy(orderSid,borrowerSid); } + + @Override + public ResultBean selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 0ef0dcf7bb..8c11a93a4c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -2111,4 +2111,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid); + return rb.success().setData(sid); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java index d0f27b249a..6cc4c348d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview; +import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; import org.apache.ibatis.annotations.Mapper; @@ -25,4 +26,7 @@ public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper selByBorrSid(String borrowerSid) { + return loanNoGuaranteeCreditReviewService.selByBorrSid(borrowerSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java index d4e6963a1f..82bf6fe139 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java @@ -324,4 +324,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService selByBorrSid(String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = baseMapper.selByBorrSid(borrowerSid); + return rb.success().setData(loanNoGuaranteeCreditReviewDetailsVo); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 219f135849..aba54be7dd 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -213,6 +213,17 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + if ("2".equals(finBillApplicationDetailsVo.getSaleTypeKey())){ + vo.setNoEditInvoiceTypeAndName(true); + vo.setNoEditInvoiceMoney(true); + }else if ("1".equals(finBillApplicationDetailsVo.getSaleTypeKey())){ + vo.setNoEditInvoiceTypeAndName(false); + if (finBillApplicationDetailsVo.getOneBillMoney() != null){ + vo.setNoEditInvoiceMoney(true); + }else { + vo.setNoEditInvoiceMoney(false); + } + } vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java index 0dd5ae1b2f..80aabbab04 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -76,7 +77,7 @@ public class AsServiceSubjectRest{ } @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); asServiceSubjectService.delBySids(sids);