From 690b55db6b0c0a2a5b53cc025652be4be15a0963 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 27 Sep 2023 10:30:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=B9=E4=BF=A1=E5=AE=A1=E7=BB=88?= =?UTF-8?q?=E5=AE=A1=E9=80=9A=E8=BF=87=E5=90=8E=E4=BF=AE=E6=94=B9=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E4=B8=9A=E5=8A=A1=E7=8A=B6=E6=80=81=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=B5=84=E6=96=B9=E7=BB=88=E5=AE=A1=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateFeign.java | 5 ++ .../BaseVehicleStateMapper.java | 2 + .../BaseVehicleStateMapper.xml | 5 ++ .../BaseVehicleStateRest.java | 5 ++ .../BaseVehicleStateService.java | 6 ++ .../BusNoGuaranteeCreditReviewVo.java | 2 +- .../BusSalesOrderBorrowerFeign.java | 4 +- .../BusSalesOrderBorrowerFeignFallback.java | 2 +- .../BusSalesOrderLoancontractFeign.java | 3 +- ...usSalesOrderLoancontractFeignFallback.java | 2 +- .../LoanOtherReceivablePush.java | 17 +++++ .../BusSalesOrderVehicleFeign.java | 4 ++ .../BusSalesOrderVehicleFeignFallback.java | 5 ++ .../BusSalesOrderBorrowerMapper.java | 4 +- .../BusSalesOrderBorrowerMapper.xml | 63 +++++++++------- .../BusSalesOrderBorrowerRest.java | 2 +- .../BusSalesOrderBorrowerService.java | 24 ++++--- .../BusSalesOrderLoancontractRest.java | 4 +- .../BusSalesOrderLoancontractService.java | 11 +-- .../BusSalesOrderVehicleRest.java | 5 ++ .../BusSalesOrderVehicleService.java | 8 ++- .../LoanNoGuaranteeCreditReview.java | 4 +- .../LoanCapitalCreditResultService.java | 30 +++++++- .../LoanNoGuaranteeCreditReviewMapper.java | 4 +- .../LoanNoGuaranteeCreditReviewService.java | 71 +++++++++++++++---- 25 files changed, 220 insertions(+), 72 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanOtherReceivablePush.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index 34b1afd0bd..2ec98195ef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -48,4 +48,9 @@ public interface BaseVehicleStateFeign { @PostMapping("updateBusStateByBusSid") ResultBean updateBusStateByBusSid(@RequestParam("busVinSid") String busVinSid, @RequestParam("busState") String busState); + @ApiModelProperty("根据车辆业务sid更新资方终审状态") + @PostMapping("updateManageState") + ResultBean updateManageState(@RequestParam("busVinSid") String busSid); + + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index 914edafa38..1e247f9b73 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -30,4 +30,6 @@ public interface BaseVehicleStateMapper extends BaseMapper { int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState); + + int updateManageState(String busSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 4d249f5418..288481dcf3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -6,6 +6,11 @@ set busState = #{busState} where busSid = #{busVinSid} + + update base_vehicle_state + set manageState = 1 + where busSid = #{busSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java index a90014a7fa..f952094f06 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java @@ -116,7 +116,7 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign { } @Override - public ResultBean fetchDetailsByOrderSid(String orderSid) { + public ResultBean> fetchDetailsByOrderSid(String orderSid) { return busSalesOrderBorrowerService.fetchDetailsByOrderSid(orderSid); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index ba63d51c5a..ba86493ff8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -54,6 +54,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -149,8 +150,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService fetchDetailsByOrderSid(String orderSid) { - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderBorrower entity = baseMapper.fetchDetailsByOrderSid(orderSid); - BusSalesOrderBorrowerDetailsVo vo = new BusSalesOrderBorrowerDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return rb.success().setData(vo); + public ResultBean> fetchDetailsByOrderSid(String orderSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + List entity = baseMapper.fetchDetailsByOrderSid(orderSid); + entity.removeAll(Collections.singleton(null)); + if (!entity.isEmpty()) { + for (BusSalesOrderBorrower busSalesOrderBorrower : entity) { + BusSalesOrderBorrowerDetailsVo vo = new BusSalesOrderBorrowerDetailsVo(); + BeanUtil.copyProperties(busSalesOrderBorrower, vo); + list.add(vo); + } + } + return rb.success().setData(list); } public List saleOrderInputLender(String saleOrderSid) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 1b47510605..e2793ae99b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -125,7 +125,7 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF } @Override - public ResultBean pushOtherReceivable(LoanContractPush loanContractPush) { - return busSalesOrderLoancontractService.pushOtherReceivable(loanContractPush); + public ResultBean pushOtherReceivable(LoanOtherReceivablePush loanOtherReceivablePush) { + return busSalesOrderLoancontractService.pushOtherReceivable(loanOtherReceivablePush); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index 783188a6a7..9bef935fe8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*; @@ -337,13 +338,15 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService selectOneByBorrowerSid(String borrowerSid) { + return busSalesOrderVehicleService.selectOneByBorrowerSid(borrowerSid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 467c5552f4..55e88d4725 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -603,6 +603,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectOneByBorrowerSid(String borrowerSid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderVehicle busSalesOrderVehicle = selectByBorrowSid(borrowerSid); + return rb.success().setData(busSalesOrderVehicle); } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java index 1476d06ebf..c51d4399fa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java @@ -15,8 +15,8 @@ import lombok.Data; @ApiModel(value = "公司非担保业务进度维护", description = "公司非担保业务进度维护") @TableName("loan_noguarantee_credit_review") public class LoanNoGuaranteeCreditReview extends BaseEntity { - @ApiModelProperty("销售订单sid") - private String salesOrderSid; + @ApiModelProperty("贷款人sid") + private String borrowerSid; @ApiModelProperty("家访考察结果") private String homeVisit; @ApiModelProperty("家访考察结果") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java index 55a64aed67..cf733d168a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java @@ -29,8 +29,15 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.api.R; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanOtherReceivablePush; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; @@ -82,6 +89,10 @@ public class LoanCapitalCreditResultService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanCapitalCreditResultQuery query = pq.getParams(); @@ -170,19 +181,32 @@ public class LoanCapitalCreditResultService extends MybatisBaseService loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType()); - if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0){ + if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0) { return rb.setMsg("请上传附件"); } baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult()); busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo()); - if("通过".equals(dto.getCapCarefulResult())){//通过推送融资放款到应收未收 + if ("通过".equals(dto.getCapCarefulResult())) {//通过推送融资放款到应收未收 LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(dtoSid); LoanContractPush loanContractPush = new LoanContractPush(); + LoanOtherReceivablePush loanOtherReceivablePush = new LoanOtherReceivablePush(); loanContractPush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid()); loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid()); + BusSalesOrderLoancontractDetailsVo loancontractDetailsVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(loanCapitalCreditResult.getLoanContractSid()).getData(); + loanOtherReceivablePush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid()); + String borrowerSid = ""; + if (loancontractDetailsVo != null) { + loanOtherReceivablePush.setBorrowerSid(loancontractDetailsVo.getBorrowerSid()); + borrowerSid = loancontractDetailsVo.getBorrowerSid(); + } ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush); //资方信审终审通过后推送财务的融资放款及金融方案中各项费用其他应收单 - ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanContractPush); + ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush); + //资方信审终审通过后修改车辆业务状态中的资方终审为1. + ResultBean busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); + if (busSalesOrderVehicle.getData() != null) { + ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid()); + } } return rb.success(); } 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 3850e8e952..37f9b7344b 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 @@ -21,6 +21,6 @@ import org.apache.ibatis.annotations.Select; public interface LoanNoGuaranteeCreditReviewMapper extends BaseMapper { - @Select("SELECT * FROM loan_noguarantee_credit_review WHERE salesOrderSid = #{salesOrderSid}") - LoanNoGuaranteeCreditReview selectOneByOrderSid(String salesOrderSid); + @Select("SELECT * FROM loan_noguarantee_credit_review WHERE borrowerSid = #{salesOrderSid}") + LoanNoGuaranteeCreditReview selectOneByBorrowerSid(String salesOrderSid); } 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 61a7418c12..a1eee32a0a 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 @@ -1,12 +1,16 @@ package com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush; +import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanOtherReceivablePush; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview; @@ -44,23 +48,28 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService details(String salesOrderSid) { ResultBean rb = ResultBean.fireFail(); LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo(); vo.setSalesOrderSid(salesOrderSid); - LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid); - BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData(); - if (null != busSalesOrder) { - if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) { - vo.setSalesman(busSalesOrder.getStaffName()); - } - } - BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsByOrderSid(salesOrderSid).getData(); + LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(salesOrderSid); + BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(salesOrderSid).getData(); if (null != borrowerDetailsVo) { if (StringUtils.isNotBlank(borrowerDetailsVo.getBorrowerName())) { vo.setBorrowerName(borrowerDetailsVo.getBorrowerName()); } + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(borrowerDetailsVo.getSalesOrderSid()).getData(); + if (null != busSalesOrder) { + if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) { + vo.setSalesman(busSalesOrder.getStaffName()); + } + } + } if (null != entity) { BeanUtil.copyProperties(entity, vo); @@ -97,10 +106,11 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService saveReviewInfo(LoanNoGuaranteeCreditReviewDto dto) { ResultBean rb = ResultBean.fireFail(); - String salesOrderSid = dto.getSalesOrderSid(); - LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid); + String borrowerSid = dto.getSalesOrderSid(); + LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByBorrowerSid(borrowerSid); if (null != entity) { BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setBorrowerSid(borrowerSid); baseMapper.updateById(entity); String sid = entity.getSid(); //删除附件表中关于该linkSid的文件 @@ -117,9 +127,31 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); + if (busSalesOrderVehicle.getData() != null) { + ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid()); + } + } + } + } } else { LoanNoGuaranteeCreditReview loanNoGuaranteeCreditReview = new LoanNoGuaranteeCreditReview(); BeanUtil.copyProperties(dto, loanNoGuaranteeCreditReview, "id", "sid"); + loanNoGuaranteeCreditReview.setBorrowerSid(borrowerSid); baseMapper.insert(loanNoGuaranteeCreditReview); String sid = loanNoGuaranteeCreditReview.getSid(); //删除附件表中关于该linkSid的文件 @@ -141,15 +173,24 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid); + if (busSalesOrderVehicle.getData() != null) { + ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid()); + } } } } } - return rb.success().setData(salesOrderSid); + return rb.success().setData(borrowerSid); } }