yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

zhanglei
God 1 year ago
parent
554efe3748
commit
04c4dd3f12
14 changed files with 114 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  2. 53
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  3. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
  4. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
  5. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java
  6. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java
  7. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
  8. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
  9. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  10. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java
  11. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewRest.java
  12. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
  13. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  14. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java

14
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -521,8 +521,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto();
scmEntryVehicleExamineDto.setBusinessSid(booad.getSid());
//发动机号
BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
scmEntryVehicleExamineDto.setEngineNo(baseVehicle1.getEngineNo());
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
scmEntryVehicleExamineDto.setEngineNo(baseVehicle.getEngineNo());
//厂家入库日期
scmEntryVehicleExamineDto.setInboundDate(DateUtil.formatDate(baseVehicle.getPriceDate()));
//配置的名称
scmEntryVehicleExamineDto.setConfigName(booad.getConfigName());
scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid());
@ -538,10 +540,6 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
scmEntryVehicleExamineDto.setVinNo(booad.getVinNo());
scmEntryVehicleExamineDto.setInspectionResult("1");
scmEntryVehicleExamineDto.setPrice("");
//根据车架号查询厂家入库日期
String vinNo = booad.getVinNo();
BaseVehicleVo data = baseVehicleService.selVehicleByVinNo(vinNo).getData();
scmEntryVehicleExamineDto.setInboundDate(DateUtil.formatDate(data.getPriceDate()));
ResultBean<String> resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
if (!resultBean1.getSuccess()) {
return rb.setMsg("验车业务模块的数据推送失败!");
@ -569,14 +567,12 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(vehicleSid, configSid, buyerOrgSid);
if (baseVehmodelVo == null) {
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
String insideCode = baseVehicle.getInsideCode();
BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
baseVehmodelConfig.setModelSid(vehicleSid);
baseVehmodelConfig.setConfigurationItemsSid(configSid);
baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
baseVehmodelConfig.setInsideCode(insideCode);
baseVehmodelConfig.setInsideCode(baseVehicle.getInsideCode());
baseVehmodelConfigService.save(baseVehmodelConfig);
}
}

53
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -110,6 +110,12 @@ import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.*;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFile;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
@ -212,6 +218,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
@Autowired
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
@Autowired
private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
@Autowired
private LoanHomevisitInvestigateCustomerFeign loanHomevisitInvestigateCustomerFeign;
@Autowired
private LoanNoGuaranteeCreditReviewFeign loanNoGuaranteeCreditReviewFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@ -1012,13 +1024,23 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
FinBillApplication entity = fetchBySid(sid);
List<FinBillVehicleVo> 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<FinBillApplica
List<String> 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);

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java
View File

@ -222,4 +222,9 @@ public interface LoanHomevisitInvestigateFeign {
@PostMapping("/selIsCompanyBuy")
@ResponseBody
ResultBean<String> selIsCompanyBuy(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid);
@ApiOperation("根据销售订单sid和贷款人sid查询家访考察sid")
@PostMapping("/selSaleOrderSidAndBorrSid")
@ResponseBody
ResultBean<String> selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid);
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java
View File

@ -215,4 +215,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
public ResultBean<String> selIsCompanyBuy(String orderSid, String borrowerSid) {
return null;
}
@Override
public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
return null;
}
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFallback.java
View File

@ -27,4 +27,9 @@ public class LoanNoGuaranteeCreditReviewFallback implements LoanNoGuaranteeCredi
public ResultBean rePush(String salesOrderSid) {
return null;
}
@Override
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
return null;
}
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java
View File

@ -41,4 +41,7 @@ public interface LoanNoGuaranteeCreditReviewFeign {
@PostMapping("/rePush")
public ResultBean rePush(@RequestParam("salesOrderSid") String salesOrderSid);
@ApiOperation("根据贷款人sid查询")
@PostMapping("/selByBorrSid")
ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(@RequestParam("borrowerSid") String borrowerSid);
}

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
View File

@ -95,4 +95,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper<LoanHomevisit
String selectByBorrSid(String borrowerSid);
String selIsCompanyBuy(@Param("orderSid") String orderSid, @Param("borrowerSid") String borrowerSid);
@Select("select sid from loan_homevisit_investigate where saleOrderSid = #{orderSid} and saleOrderBorrowerSid = #{borrowerSid}")
String selSaleOrderSidAndBorrSid(@Param("orderSid") String orderSid,@Param("borrowerSid") String borrowerSid);
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java
View File

@ -240,4 +240,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
public ResultBean<String> selIsCompanyBuy(String orderSid, String borrowerSid) {
return loanHomevisitInvestigateService.selIsCompanyBuy(orderSid,borrowerSid);
}
@Override
public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
}
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -2111,4 +2111,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
String isKp = baseMapper.selIsCompanyBuy(orderSid,borrowerSid);
return rb.success().setData(isKp);
}
public ResultBean<String> selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
String sid = baseMapper.selSaleOrderSidAndBorrSid(orderSid,borrowerSid);
return rb.success().setData(sid);
}
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewMapper.java
View File

@ -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<LoanNoGuar
LoanNoGuaranteeCreditReview selectOneByBorrowerSid(String salesOrderSid);
int updateByBorrow(String borrowerSid);
@Select("SELECT * FROM loan_noguarantee_credit_review WHERE borrowerSid = #{borrowerSid}")
LoanNoGuaranteeCreditReviewDetailsVo selByBorrSid(String borrowerSid);
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewRest.java
View File

@ -40,4 +40,9 @@ public class LoanNoGuaranteeCreditReviewRest implements LoanNoGuaranteeCreditRev
public ResultBean rePush(String salesOrderSid) {
return loanNoGuaranteeCreditReviewService.rePush(salesOrderSid);
}
@Override
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
return loanNoGuaranteeCreditReviewService.selByBorrSid(borrowerSid);
}
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
View File

@ -324,4 +324,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
}
return rb.success();
}
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> selByBorrSid(String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = baseMapper.selByBorrSid(borrowerSid);
return rb.success().setData(loanNoGuaranteeCreditReviewDetailsVo);
}
}

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
View File

@ -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());

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectRest.java
View File

@ -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);

Write Preview
Loading…
Cancel
Save