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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
5753b41862 2af3671552
commit
acc5d978be
8 changed files with 59 additions and 25 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. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  2. 13
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  3. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffFeign.java
  4. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java
  5. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java
  6. 44
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
  7. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  8. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -431,7 +431,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
if (null != resultBean.getData()) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
if (null != solutions) {
/*if (null != solutions) {
if (StringUtils.isNotBlank(loanOtherReceivablePush.getIsCompInvoic())) {
if (loanOtherReceivablePush.getIsCompInvoic().equals("1")) {
//挂车待退款
@ -449,7 +449,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
} else {
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
}
}
}*/
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());

13
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -3179,6 +3179,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("该申请不存在");
}
cashierPushConfirm(sid);
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
FinCollectionConfirmation finalConfirmation = confirmation;
Future future1 = pool.submit(() -> {
pushLoanDiff(finalConfirmation);
});
} catch (Exception e) {
e.printStackTrace();
}
return rb.success();
}

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffFeign.java
View File

@ -39,7 +39,7 @@ public interface LoanDiffFeign {
@ApiOperation("详情")
@GetMapping("/details")
ResultBean<LoanDiffInitDetails> details(@RequestParam("sid")String sid);
ResultBean<LoanDiffInitDetails> details(@RequestParam("sid") String sid);
@ApiOperation("提交")
@PostMapping("/submitDiffApply")
@ -49,6 +49,10 @@ public interface LoanDiffFeign {
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody DiffCompleteDto query);
@ApiOperation(value = "重推其他应收单")
@PostMapping("/ctDiff")
public ResultBean ctDiff(@RequestParam("sid") String sid);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<DiffApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap DiffApplyNodeQuery query);
@ -71,7 +75,7 @@ public interface LoanDiffFeign {
@ApiOperation(value = "app详情")
@PostMapping(value = "/appDetails/{sid}")
ResultBean<LoanDiffDetailsssApp> appDetails(@PathVariable("sid")String sid);
ResultBean<LoanDiffDetailsssApp> appDetails(@PathVariable("sid") String sid);
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitZLVo.java
View File

@ -31,6 +31,8 @@ public class LoanHomeVisitInvestigateInitZLVo implements Vo {
private List<String> lenderBankStatement;
@ApiModelProperty("是否有配偶")
private Boolean spouseState = false;
@ApiModelProperty("是否有担保人")
private Boolean dbrState = false;
@ApiModelProperty("配偶身份证")
private List<String> spouseIdCard;
@ApiModelProperty("配偶户口本")

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffRest.java
View File

@ -61,6 +61,11 @@ public class LoanDiffRest implements LoanDiffFeign {
return loanDiffService.complete(bv);
}
@Override
public ResultBean ctDiff(String sid) {
return loanDiffService.ctDiff(sid);
}
@Override
public ResultBean<List<DiffApplyNodeVo>> getPreviousNodesForReject(DiffApplyNodeQuery query) {
return loanDiffService.getPreviousNodesForReject(query);

44
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
View File

@ -155,24 +155,24 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
//验证差额=实际之和
List<LoanDiffDetailsDto> loanDiffDetails = dto.getLoanDiffDetails();
loanDiffDetails.removeAll(Collections.singleton(null));
if(!loanDiffDetails.isEmpty()){
if (!loanDiffDetails.isEmpty()) {
for (int i = 0; i < loanDiffDetails.size(); i++) {
LoanDiffDetailsDto loanDiffDetailsDto = loanDiffDetails.get(i);
BigDecimal bigAll = BigDecimal.ZERO;
BigDecimal diffLoan = new BigDecimal(loanDiffDetailsDto.getDiffLoan());
if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityDiscount())){
if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityDiscount())) {
bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityDiscount()));
}
if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityLoanMargin())){
if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityLoanMargin())) {
bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityLoanMargin()));
}
if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityOtherDiscount())){
if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityOtherDiscount())) {
bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityOtherDiscount()));
}
if(StringUtils.isNotBlank(loanDiffDetailsDto.getRealityPremium())){
if (StringUtils.isNotBlank(loanDiffDetailsDto.getRealityPremium())) {
bigAll = bigAll.add(new BigDecimal(loanDiffDetailsDto.getRealityPremium()));
}
if(bigAll.compareTo(diffLoan) != 0){
if (bigAll.compareTo(diffLoan) != 0) {
return rb.setMsg("放款差额不等于其他四项实际之和，不允许提交");
}
}
@ -299,7 +299,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(busSalesOrder.getSid());
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
if(loanFinPolicy != null){
if (loanFinPolicy != null) {
LoanFinBank loanFinBank = loanFinBankService.fetchBySid(loanFinPolicy.getBankSid());
creditResult.setBankName(loanFinBank.getBankNo());
}
@ -338,13 +338,13 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
if (loanDiffDetails.getRealityLoanMargin() != null) {//实扣贷款保证金
if(loanDiffDetails.getRealityLoanMargin().compareTo(BigDecimal.ZERO) != 0){
if (loanDiffDetails.getRealityLoanMargin().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -353,13 +353,13 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
}
if (loanDiffDetails.getRealityDiscount() != null) {//实扣主产品厂家贴息
if(loanDiffDetails.getRealityDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanDiffDetails.getRealityDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -368,13 +368,13 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
}
if (loanDiffDetails.getRealityOtherDiscount() != null) {//实扣其他融厂家贴息
if(loanDiffDetails.getRealityOtherDiscount().compareTo(BigDecimal.ZERO) != 0){
if (loanDiffDetails.getRealityOtherDiscount().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -383,13 +383,13 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
}
if (loanDiffDetails.getReceivedPremium() != null) {//已收意外险
if(loanDiffDetails.getReceivedPremium().compareTo(BigDecimal.ZERO) != 0){
if (loanDiffDetails.getReceivedPremium().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -398,13 +398,13 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
}
if (loanDiffDetails.getDiffPremium() != null) {//意外险差额
if(loanDiffDetails.getDiffPremium().compareTo(BigDecimal.ZERO) != 0){
if (loanDiffDetails.getDiffPremium().compareTo(BigDecimal.ZERO) != 0) {
CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
if(baseVehicle != null){
if (baseVehicle != null) {
String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
creditResultDetailDto.setMaterialNo(vinNo);
}
@ -415,7 +415,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
creditResult.setResultDetails(collectionDetailDtoListOne);
creditResult.setRemarks("放款差额");
finKingDeeFeign.pushOtherReceivableBill(creditResult);
int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(),loanDiffDetails.getRealityLoan().toString());
int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString());
}
}
}
@ -657,7 +657,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
BeanUtil.copyProperties(dto, loanDiff);
List<LoanDiffDetailssDto> loanDiffDetailssDtos = dto.getLoanDiffDetailssDtos();
loanDiffDetailssDtos.removeAll(Collections.singleton(null));
String billNo =getApplyCode(loanDiff.getOrgSidPath());
String billNo = getApplyCode(loanDiff.getOrgSidPath());
loanDiff.setBillNo(billNo);
if (!loanDiffDetailssDtos.isEmpty()) {
for (int i = 0; i < loanDiffDetailssDtos.size(); i++) {
@ -788,4 +788,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
flowFeign.delegate(delegateQuery);
return rb.success();
}
public ResultBean ctDiff(String sid) {
ResultBean rb = ResultBean.fireFail();
pushFinOther(sid);
return rb.success();
}
}

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

@ -1680,7 +1680,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomevisitInvestigatePropertyDetailsVo loanHomevisitInvestigatePropertyDetailsVo = loanHomevisitInvestigatePropertyService.selByMainSid(sid);
List<FinanceForm> zCInfo = new ArrayList<>();
if (loanHomevisitInvestigatePropertyDetailsVo != null) {
if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) {
if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate() != null && loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) {
FinanceForm financeForm43 = new FinanceForm();
financeForm43.setValue("房产");
financeForm43.setSpanSize(2);
@ -1706,7 +1706,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
financeForm46.setSpanSize(2);
zCInfo.add(financeForm46);
}
if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar()) {
if (loanHomevisitInvestigatePropertyDetailsVo.getIsCar() != null && loanHomevisitInvestigatePropertyDetailsVo.getIsCar()) {
FinanceForm financeForm47 = new FinanceForm();
String carType = "";
if (loanHomevisitInvestigatePropertyDetailsVo.getCarType() == 1) {
@ -1919,6 +1919,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
}
loanHomeVisitInvestigateInitZLVo.setGuarantorAccount(guarantorAccount);
loanHomeVisitInvestigateInitZLVo.setDbrState(true);
}
}
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZLVo.java
View File

@ -31,6 +31,8 @@ public class AppLoanHomeVisitInvestigateInitZLVo implements Vo {
private List<String> lenderBankStatement;
@ApiModelProperty("是否有配偶")
private Boolean spouseState = false;
@ApiModelProperty("是否有担保人")
private Boolean dbrState = false;
@ApiModelProperty("配偶身份证")
private List<String> spouseIdCard;
@ApiModelProperty("配偶户口本")

Write Preview
Loading…
Cancel
Save