Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
a7dbbf0633
  1. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  2. 20
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  3. 26
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java
  4. 29
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java
  5. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java
  6. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java
  7. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java
  8. 18
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java
  9. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java
  10. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  11. 104
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  12. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java
  13. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml
  14. 25
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
  15. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java
  16. 71
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  17. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  18. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  19. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  20. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java
  21. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java
  22. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java
  23. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java
  24. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java
  25. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java
  26. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java
  27. 6
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java
  28. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java
  29. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java
  30. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java
  31. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java
  32. 19
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java
  33. 12
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
  34. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java
  35. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java
  36. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java
  37. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java
  38. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml
  39. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java
  40. 107
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java
  41. 8
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java
  42. 73
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
  43. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  44. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java
  45. 54
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  46. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
  47. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
  48. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java
  49. 30
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java
  50. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java
  51. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java
  52. 25
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java
  53. 26
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
  54. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java
  55. 30
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@ -351,4 +351,24 @@ public interface BusSalesOrderFeign {
@GetMapping("/getSalesOrderOne")
@ResponseBody
ResultBean<BusSalesOrdersVo> getSalesOrderOne(@RequestParam("sid") String sid);
@ApiOperation("初始化录入贷款人列表")
@GetMapping("/saleOrderInputLender/{saleOrderSid}")
@ResponseBody
ResultBean<SalesLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
@ApiOperation("删除销售订单贷款人")
@DeleteMapping("/deleteSaleOrderInputLender/{sid}")
@ResponseBody
ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
@ApiOperation("删除销售订单贷款人")
@PostMapping("/saveBorrowNum/{sid}/{num}")
@ResponseBody
ResultBean saveBorrowNum(@PathVariable("sid") String sid, @PathVariable("num") String num);
@ApiOperation("保存销售订单贷款人自己")
@PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}")
@ResponseBody
ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid);
}

20
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@ -326,4 +326,24 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean<BusSalesOrdersVo> getSalesOrderOne(String sid) {
return null;
}
@Override
public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
return null;
}
@Override
public ResultBean deleteSaleOrderInputLender(String sid) {
return null;
}
@Override
public ResultBean saveBorrowNum(String sid, String num) {
return null;
}
@Override
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
return null;
}
}

26
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/LenderVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class LenderVo implements Vo {
private static final long serialVersionUID = 7304958451535278499L;
@ApiModelProperty("数量")
private String vinNum;
@ApiModelProperty("记录sid")
private String sid;
@ApiModelProperty("贷款人")
private String lenderName;
@ApiModelProperty("是否显示删除:没确认可以删除")
private boolean showDelete;
@ApiModelProperty("是否显示确认,没确认可以确认")
private boolean showConfirm;
}

29
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SalesLenderVo.java

@ -0,0 +1,29 @@
package com.yxt.anrui.buscenter.api.bussalesorder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class SalesLenderVo {
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("订单台数")
private Integer orderCarNum;
@ApiModelProperty("确认台数")
private Integer confirmCarNum;
@ApiModelProperty("是否显示自己:当贷款人没有本人时才显示,当确定的台数与总台数相同时,不允许显示")
private boolean showOwn;
@ApiModelProperty("是否显示选择按钮,当确定台数与总台数相同时,不允许显示")
private boolean showSelect;
private List<LenderVo> lenderList = new ArrayList<>();
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusNoGuaranteeCreditReviewQuery.java

@ -37,6 +37,12 @@ public class BusNoGuaranteeCreditReviewQuery implements Query {
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("家访考察结果")
private String homeVisitKey;
@ApiModelProperty("信审终审结果")
private String creditReviewKey;
@ApiModelProperty("放款审核结果")
private String loanReviewKey;
@ApiModelProperty("家访考察结果")
private String homeVisit;
@ApiModelProperty("信审终审结果")
private String creditReview;

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java

@ -95,4 +95,8 @@ public interface BusSalesOrderLoancontractFeign {
@ResponseBody
public ResultBean<PagerVo<BusLoancontractForRepayVo>> listPageForRepay(@RequestBody PagerQuery<BusLoancontractForRepayQuery> pq);
@ApiOperation("推送融资放款的应收")
@PostMapping("/pushLoanOrder")
@ResponseBody
ResultBean pushLoanOrder(@RequestBody LoanContractPush loanContractPush);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java

@ -89,4 +89,9 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan
public ResultBean<PagerVo<BusLoancontractForRepayVo>> listPageForRepay(PagerQuery<BusLoancontractForRepayQuery> pq) {
return null;
}
@Override
public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
return null;
}
}

18
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/LoanContractPush.java

@ -0,0 +1,18 @@
package com.yxt.anrui.buscenter.api.bussalesorderloancontract;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class LoanContractPush {
@ApiModelProperty("消贷合同sid")
private String loanContractSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
}

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

@ -25,6 +25,8 @@
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesordervehicle;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@ -66,8 +68,10 @@ public class BusSalesOrderVehicle extends BaseEntity {
@ApiModelProperty("临时客户名称")
private String temporaryName;
@ApiModelProperty("贷款人sid")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String borrowerSid;
@ApiModelProperty("贷款人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String borrowName;
}

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@ -409,4 +409,24 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
public ResultBean<BusSalesOrdersVo> getSalesOrderOne(String sid) {
return busSalesOrderService.getSalesOrderOne(sid);
}
@Override
public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
return busSalesOrderService.saleOrderInputLender(saleOrderSid);
}
@Override
public ResultBean deleteSaleOrderInputLender(String sid) {
return busSalesOrderService.deleteSaleOrderInputLender(sid);
}
@Override
public ResultBean saveBorrowNum(String sid, String num) {
return busSalesOrderService.saveBorrowNum(sid,num);
}
@Override
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
return busSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
}
}

104
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -79,6 +79,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.*;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
@ -113,6 +114,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService;
import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerService;
import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
@ -331,6 +333,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private DocPdfComponent docPdfComponent;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
/**
* 构造查询条件
@ -7347,4 +7351,104 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vinVo.setVinList(vinList);
return rb.success().setData(vinVo);
}
public ResultBean<SalesLenderVo> saleOrderInputLender(String saleOrderSid) {
ResultBean<SalesLenderVo> rb = ResultBean.fireFail();
SalesLenderVo salesLenderVo = new SalesLenderVo();
salesLenderVo.setSaleOrderSid(saleOrderSid);
//订单总台数
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid);
//查询该销售订单已确定的数量
int counts = busSalesOrderBorrowerService.selectByNum(saleOrderSid);
if (busSalesOrderPrice != null) {
salesLenderVo.setOrderCarNum(busSalesOrderPrice.getQuantity());
int allNum = busSalesOrderPrice.getQuantity();
if (counts < allNum) {
salesLenderVo.setShowOwn(true);
salesLenderVo.setShowSelect(true);
}
}
int confirmNum = 0;
//根据销售订单sid查询所有选择的贷款人
List<LenderVo> lenderList = busSalesOrderBorrowerService.saleOrderInputLender(saleOrderSid);
lenderList.removeAll(Collections.singleton(null));
if (!lenderList.isEmpty()) {
for (int i = 0; i < lenderList.size(); i++) {
LenderVo lenderVo = lenderList.get(i);
String sid = lenderVo.getSid();
//根据销售订单贷款人表sid查询家纺准备是否存在
int count = busSalesOrderBorrowerService.selectBorrow(sid);
if (count > 0) {
lenderVo.setShowConfirm(false);
lenderVo.setShowDelete(false);
} else {
lenderVo.setShowConfirm(true);
lenderVo.setShowDelete(true);
}
if (StringUtils.isNotBlank(lenderVo.getVinNum())) {
confirmNum = confirmNum + Integer.parseInt(lenderVo.getVinNum());
} else {
confirmNum = confirmNum;
}
}
}
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
if (busSalesOrderBorrower == null) {
salesLenderVo.setShowOwn(true);
}
salesLenderVo.setConfirmCarNum(confirmNum);
salesLenderVo.setLenderList(lenderList);
return rb.success().setData(salesLenderVo);
}
public ResultBean deleteSaleOrderInputLender(String sid) {
ResultBean rb = ResultBean.fireFail();
//删除销售订单车辆表中的贷款人的名称
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(sid);
if (busSalesOrderVehicle != null) {
busSalesOrderVehicle.setBorrowerSid("");
busSalesOrderVehicle.setBorrowName("");
busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
}
//删除销售订单贷款表的数据
busSalesOrderBorrowerService.deleteBySid(sid);
return rb.success();
}
public ResultBean saveBorrowNum(String sid, String num) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
if (busSalesOrderBorrower == null) {
return rb.setMsg("该贷款人不存在");
}
//查询该销售订单已确定的数量
int count = busSalesOrderBorrowerService.selectByNum(busSalesOrderBorrower.getSalesOrderSid());
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrderBorrower.getSalesOrderSid());
if (busSalesOrderPrice != null) {
int allNum = busSalesOrderPrice.getQuantity();
if (count >= allNum) {
return rb.setMsg("销售订单的剩余台数已不足");
}
}
busSalesOrderBorrower.setVehCount(Integer.parseInt(num));
busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
return rb.success();
}
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
ResultBean rb = ResultBean.fireFail();
//查询该销售订单的贷款人中是否已存在该客户的贷款人
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid);
if (busSalesOrderBorrower != null) {
return rb.setMsg("客户本人已存在贷款人中");
}
BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
busSalesOrderBorrower = new BusSalesOrderBorrower();
busSalesOrderBorrower.setSalesOrderSid(saleOrderSid);
busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid());
busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName());
busSalesOrderBorrower.setMobile(busSalesOrder.getMobile());
busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
return rb.success();
}
}

9
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusNoGuaranteeCreditReviewVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
@ -82,4 +83,12 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
@Select("select * from bus_sales_order_borrower where salesOrderSid =#{orderSid}")
BusSalesOrderBorrower fetchDetailsByOrderSid(String orderSid);
List<LenderVo> saleOrderInputLender(String saleOrderSid);
int selectBorrow(String sid);
int selectByNum(String salesOrderSid);
BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
}

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@ -54,5 +54,25 @@
FROM bus_sales_order_borrower AS bor
LEFT JOIN bus_sales_order AS bo ON bor.salesOrderSid = bo.sid
LEFT JOIN anrui_riskcenter.loan_noguarantee_credit_review AS cr ON cr.salesOrderSid = bo.sid
<where>${ew.sqlSegment}</where>
</select>
<select id="saleOrderInputLender" resultType="com.yxt.anrui.buscenter.api.bussalesorder.LenderVo">
select vehCount as vinNum,sid,borrowerName as lenderName from bus_sales_order_borrower where salesOrderSid = #{saleOrderSid}
</select>
<select id="selectBorrow" resultType="int">
select count(*) from anrui_riskcenter.loan_homevisit_prep where saleOrderBorrowerSid = #{sid}
</select>
<select id="selectByNum" resultType="int">
select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{salesOrderSid}
</select>
<select id="selectByOrderSids" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower">
select * from bus_sales_order_borrower bb left join
bus_sales_order bo on bo.sid = bb.salesOrderSid
where bo.customerSid = bb.customSid and bo.sid = #{saleOrderSid}
</select>
</mapper>

25
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderborrower;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.LenderVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.*;
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
@ -239,7 +240,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
);
//分公司
if (StringUtils.isNotBlank(pagerQuery.getCompany())) {
qw.like("bo.usdOrgName", pagerQuery.getCompany());
qw.like("bo.useOrgName", pagerQuery.getCompany());
}
//销售部门
if (StringUtils.isNotBlank(pagerQuery.getDepartment())) {
@ -263,15 +264,15 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
}
//家访考察结果
if (StringUtils.isNotBlank(pagerQuery.getHomeVisit())) {
qw.like("cr.homeVisit", pagerQuery.getHomeVisit());
qw.eq("cr.homeVisit", pagerQuery.getHomeVisit());
}
//信审终审结果
if (StringUtils.isNotBlank(pagerQuery.getCreditReview())) {
qw.like("cr.creditReview", pagerQuery.getCreditReview());
qw.eq("cr.creditReview", pagerQuery.getCreditReview());
}
//放款审核结果
if (StringUtils.isNotBlank(pagerQuery.getLoanReview())) {
qw.like("cr.loanReview", pagerQuery.getLoanReview());
qw.eq("cr.loanReview", pagerQuery.getLoanReview());
}
//是否放款
if (StringUtils.isNotBlank(pagerQuery.getIsLoan())) {
@ -293,4 +294,20 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
BeanUtil.copyProperties(entity, vo);
return rb.success().setData(vo);
}
public List<LenderVo> saleOrderInputLender(String saleOrderSid) {
return baseMapper.saleOrderInputLender(saleOrderSid);
}
public int selectBorrow(String sid) {
return baseMapper.selectBorrow(sid);
}
public int selectByNum(String salesOrderSid) {
return baseMapper.selectByNum(salesOrderSid);
}
public BusSalesOrderBorrower selectOrderSid(String saleOrderSid) {
return baseMapper.selectByOrderSids(saleOrderSid);
}
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java

@ -118,4 +118,9 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF
PagerVo<BusLoancontractForRepayVo> pv = busSalesOrderLoancontractService.listPageForRepay(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush);
}
}

71
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@ -28,15 +28,22 @@ package com.yxt.anrui.buscenter.biz.bussalesorderloancontract;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.*;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -47,6 +54,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -72,6 +80,12 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
private SysUserFeign sysUserFeign;
@Autowired
private BusSalesOrderVehicleService busSalesOrderVehicleService;
@Autowired
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private BusSalesOrderService busSalesOrderService;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedDetailedFeign;
private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -238,4 +252,61 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
baseMapper.updateBankConAndBusNo(loanContractSid, bankContractNo);
return rb.success();
}
public ResultBean pushLoanOrder(LoanContractPush loanContractPush) {
ResultBean rb = ResultBean.fireFail();
String saleOrderSid = loanContractPush.getSaleOrderSid();
String loanContractSid = loanContractPush.getLoanContractSid();
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(saleOrderSid);
//根据消贷合同查询贷款人
BusSalesOrderLoancontract busSalesOrderLoancontract = fetchBySid(loanContractSid);
if(busSalesOrderLoancontract != null){
//根据销售订单的贷款人sid查询车辆表中的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByBorrowSid(busSalesOrderLoancontract.getBorrowerSid());
//这是生成业务系统融资放款应收的逻辑:
// 融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息],根据选择的产品政策来判断,若贷款保证金为固定的,需要减去,若为敞口的,不需要减;差额放款需要减厂家贴息,全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中,
//计算融资放款的金额以及厂家贴息金额
ResultBean<PushVo> resultBean = loanSolutionsFeign.selectMoney(saleOrderSid);
if(resultBean.getData() != null){
PushVo pushVo = resultBean.getData();
UnCollectionDto unCollectionDto = new UnCollectionDto();
unCollectionDto.setContractNo(busSalesOrder.getContractNo());
// unCollectionDto.setContractSid(contractSid);
//客户名称
unCollectionDto.setCustomerName(busSalesOrder.getCustomerName());
//客户sid
unCollectionDto.setCustomerSid(busSalesOrder.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(busSalesOrder.getCustomerClass());
//客户类型
unCollectionDto.setCustomerClassKey(busSalesOrder.getCustomerClassKey());
//客户头像
unCollectionDto.setCustomerImage(busSalesOrder.getCustomerPhoto());
unCollectionDto.setReceivablesName("融资放款");
unCollectionDto.setCustomerPhone(busSalesOrder.getMobile());
unCollectionDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
unCollectionDto.setVinNo(busSalesOrderVehicle.getLinkNo());
unCollectionDto.setCurrentReceivableMoney(pushVo.getMoney());
unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setReveivableMoney(pushVo.getMoney());
unCollectionDto.setBusVinSid(busSalesOrderVehicle.getSid());
unCollectionDto.setPayType(busSalesOrder.getPayType());
unCollectionDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
unCollectionDto.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
if (StringUtils.isNotBlank(pushVo.getOtherReceivableMoney())) {
unCollectionDto.setOtherReceivableMoney(new BigDecimal(pushVo.getOtherReceivableMoney()));
}
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
return rb.success();
}
}

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

@ -153,4 +153,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid);
BusSalesOrderVehicle selectByBorrowSid(String sid);
}

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

@ -252,4 +252,8 @@
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
</select>
<select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select * from bus_sales_order_vehicle where borrowerSid = #{sid}
</select>
</mapper>

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

@ -583,4 +583,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid) {
return baseMapper.selectListByOrdersSid(saleOrderSid);
}
public BusSalesOrderVehicle selectByBorrowSid(String sid) {
return baseMapper.selectByBorrowSid(sid);
}
}

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java

@ -14,6 +14,7 @@ public enum LoanFileEnum {
HOME_VISIT_FILES("005", "非担保业务进度家访考察结果"),
CREDIT_REVIEW_FILES("006", "非担保业务进度资方信审结果"),
LOAN_REVIEW_FILES("007", "非担保业务进度资方放款审核结果"),
FIN_BANK("008", "资方"),
;

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankDto.java

@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -54,4 +56,5 @@ public class LoanFinBankDto implements Dto {
private String useOrgName;
@ApiModelProperty("使用组织全路径")
private String orgSidPath;
private List<String> finBankFiles = new ArrayList<>();
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinbank/LoanFinBankInitVo.java

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
@ -37,6 +39,7 @@ public class LoanFinBankInitVo implements Vo {
private String contractSetValue;
@ApiModelProperty("银行卡要求说明")
private String bankCardRemark;
private List<String> finBankFiles = new ArrayList<>();
// @ApiModelProperty("使用组织sid")
// private String useOrgSid;
// @ApiModelProperty("使用组织名称")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java

@ -57,7 +57,11 @@ public interface LoanFinPolicyFeign {
@ApiOperation("已备案的产品政策(分公司,有效期内)")
@GetMapping("selectList")
ResultBean<List<PolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam("isPack") String isPack, @RequestParam(value = "name", required = false) String name);
ResultBean<List<PolicyVo>> selectList(@RequestParam("orgPath") String orgPath,
@RequestParam("userSid") String userSid,
@RequestParam("isPack") String isPack,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "vehTypeKey", required = false) String vehTypeKey);
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanRiskStateQuery.java

@ -18,4 +18,6 @@ public class LoanRiskStateQuery {
private List<String> sidsList = new ArrayList<>();
@ApiModelProperty("riskState为1时走禁用,为0时走启用")
private String riskState;
private String userSid;
}

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReview.java

@ -19,14 +19,20 @@ public class LoanNoGuaranteeCreditReview extends BaseEntity {
private String salesOrderSid;
@ApiModelProperty("家访考察结果")
private String homeVisit;
@ApiModelProperty("家访考察结果")
private String homeVisitKey;
@ApiModelProperty("家访考察日期")
private String homeVisitDate;
@ApiModelProperty("信审终审结果")
private String creditReview;
@ApiModelProperty("信审终审结果")
private String creditReviewKey;
@ApiModelProperty("信审终审日期")
private String creditReviewDate;
@ApiModelProperty("放款审核结果")
private String loanReview;
@ApiModelProperty("放款审核结果")
private String loanReviewKey;
@ApiModelProperty("放款审核日期")
private String loanReviewDate;
@ApiModelProperty("是否放款")

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDetailsVo.java

@ -20,6 +20,12 @@ public class LoanNoGuaranteeCreditReviewDetailsVo implements Vo {
@ApiModelProperty("贷款人")
private String borrowerName;
@ApiModelProperty("家访考察结果")
private String homeVisitKey;
@ApiModelProperty("信审终审结果")
private String creditReviewKey;
@ApiModelProperty("放款审核结果")
private String loanReviewKey;
@ApiModelProperty("家访考察结果")
private String homeVisit;
@ApiModelProperty("家访考察日期")
private String homeVisitDate;

6
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewDto.java

@ -21,6 +21,12 @@ public class LoanNoGuaranteeCreditReviewDto implements Dto {
@ApiModelProperty("贷款人")
private String borrowerName;
@ApiModelProperty("家访考察结果")
private String homeVisitKey;
@ApiModelProperty("信审终审结果")
private String creditReviewKey;
@ApiModelProperty("放款审核结果")
private String loanReviewKey;
@ApiModelProperty("家访考察结果")
private String homeVisit;
@ApiModelProperty("家访考察日期")
private String homeVisitDate;

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewFeign.java

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public interface LoanNoGuaranteeCreditReviewFeign {
@ApiOperation("编辑回显、详情")
@PostMapping("/details")
@GetMapping("/details")
@ResponseBody
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(@RequestParam("salesOrderSid") String salesOrderSid);

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java

@ -18,7 +18,8 @@ public class LoanOrderPreloanVo implements Vo {
private String quantity;
@ApiModelProperty("按钮:信用审核、当为等待中时为我知道了、信用申诉")
private String confirmBtn;
@ApiModelProperty("信用审核的sid")
private String sid;
}

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@ -118,5 +118,7 @@ public interface LoanSolutionsFeign {
@PostMapping("/details2")
ResultBean<SolutionssVo> details2(@RequestBody SolutionssQuery query);
@ApiOperation("查询融资放款的金额")
@GetMapping("/selectMoney")
ResultBean<PushVo> selectMoney(@RequestParam("saleOrderSid") String saleOrderSid);
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@ -88,6 +88,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
return null;
}
@Override
public ResultBean<PushVo> selectMoney(String saleOrderSid) {
return null;
}
/* @Override
public ResultBean<PagerVo<LoanSolutionsVo>> listPage(PagerQuery<LoanSolutionsQuery> pq) {
ResultBean rb = ResultBean.fireFail();

19
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/PushVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.riskcenter.api.loansolutions;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class PushVo implements Vo {
private static final long serialVersionUID = 7612306872701336004L;
@ApiModelProperty("融资放款金额")
private String money;
@ApiModelProperty("厂家贴息金额")
private String otherReceivableMoney;
}

12
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@ -30,6 +30,7 @@ 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.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.LoanContractPush;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
@ -174,6 +175,13 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
}
baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult());
busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo());
if("通过".equals(dto.getCapCarefulResult())){//通过推送融资放款到应收未收
LoanCapitalCreditResult loanCapitalCreditResult = fetchBySid(dtoSid);
LoanContractPush loanContractPush = new LoanContractPush();
loanContractPush.setLoanContractSid(loanCapitalCreditResult.getLoanContractSid());
loanContractPush.setSaleOrderSid(loanCapitalCreditResult.getSaleOrderSid());
ResultBean resultBean = busSalesOrderLoancontractFeign.pushLoanOrder(loanContractPush);
}
return rb.success();
}
@ -227,8 +235,4 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
}
return rb.success().setData(xsfjImages);
}
public void getOrderPush(){
}
}

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankRest.java

@ -1,7 +1,9 @@
package com.yxt.anrui.riskcenter.biz.loanfinbank;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanfinbank.*;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
@ -45,6 +47,8 @@ public class LoanFinBankRest implements LoanFinBankFeign {
private HttpServletResponse response;
@Autowired
private LoanFinPolicyService loanFinPolicyService;
@Autowired
private LoanFileService loanFileService;
@Override
public ResultBean<PagerVo<LoanFinBankVo>> listPage(PagerQuery<LoanFinBankQuery> pq) {
@ -72,6 +76,12 @@ public class LoanFinBankRest implements LoanFinBankFeign {
if (i == 0) {
return ResultBean.fireFail().setMessage("修改失败");
}
//删除附件表中关于该linkSid的文件
loanFileService.deleteByLinkSid(sid);
List<String> finBankFiles = dto.getFinBankFiles();
if (!finBankFiles.isEmpty()) {
loanFileService.saveAll(sid, finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
}
return rb.success().setMessage("修改成功");
} else {
//查询资方名称是否重复

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinbank/LoanFinBankService.java

@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanfinbank.*;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -20,6 +24,7 @@ import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Project: anrui-base(安瑞基础信息模块) <br/>
@ -43,6 +48,10 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanFileService loanFileService;
public PagerVo<LoanFinBank> listPage(PagerQuery<LoanFinBankQuery> pq) {
LoanFinBankQuery query = pq.getParams();
@ -104,6 +113,12 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
entity.setCreateBySid(dto.getUserSid());
}
this.saveOrUpdate(entity);
//删除附件表中关于该linkSid的文件
loanFileService.deleteByLinkSid(entity.getSid());
List<String> finBankFiles = dto.getFinBankFiles();
if (!finBankFiles.isEmpty()) {
loanFileService.saveAll(entity.getSid(), finBankFiles, LoanFileEnum.FIN_BANK.getAttachType());
}
}
public LoanFinBankVo fetchByIdVo(String id) {
@ -212,6 +227,14 @@ public class LoanFinBankService extends MybatisBaseService<LoanFinBankMapper, Lo
LoanFinBankInitVo vo = new LoanFinBankInitVo();
LoanFinBank loanFinBank = fetchBySid(sid);
BeanUtil.copyProperties(loanFinBank, vo);
//家访考察结果截图
List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.FIN_BANK.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> finBankFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setFinBankFiles(finBankFiles);
}
return rb.success().setData(vo);
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java

@ -92,8 +92,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
if (!dto.getAnnexPaths().isEmpty()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : dto.getAnnexPaths()) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
String replace = filePath.replace(urlPrefix, "");
sb.append(replace).append(",");
}
sb.delete(sb.length() - 1, sb.length());
entity.setAnnexPath(sb.toString());
@ -131,8 +131,8 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService<Loa
if (!dto.getAnnexPaths().isEmpty()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : dto.getAnnexPaths()) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
String replace = filePath.replace(urlPrefix, "");
sb.append(replace).append(",");
}
sb.delete(sb.length() - 1, sb.length());
entity.setAnnexPath(sb.toString());

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.java

@ -27,5 +27,5 @@ public interface LoanFinPolicyMapper extends BaseMapper<LoanFinPolicy> {
AppPolicyDetailsVo getProductInfo(String sid);
List<PolicyVo> selectListOne(@Param("useOrgSid") String useOrgSid,@Param("isPack") String isPack,@Param("name") String name);
List<PolicyVo> selectListOne(@Param("deptSid") String deptSid,@Param("isPack") String isPack,@Param("name") String name,@Param("vehTypeKey") String vehTypeKey);
}

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@ -106,7 +106,12 @@
from loan_fin_policy lfp
where lfp.filingState = 1
and isPack = #{isPack}
and lfp.useOrgSid = #{useOrgSid}
<if test="deptSid != null and deptSid != ''">
and lfp.useDeptSids like concat('%',#{deptSid},'%')
</if>
<if test="vehTypeKey != null and vehTypeKey != ''">
and lfp.vehTypeKey like concat('%',#{vehTypeKey},'%')
</if>
and lfp.validDateTo > now() and lfp.useSate = 0 and lfp.riskState = 0
<if test="name != null and name != ''">
and lfp.policyName like concat('%', #{name}, '%')

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyRest.java

@ -69,7 +69,7 @@ public class LoanFinPolicyRest implements LoanFinPolicyFeign {
}
@Override
public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name) {
return loanFinPolicyService.selectList(orgPath, userSid, isPack, name);
public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) {
return loanFinPolicyService.selectList(orgPath, userSid, isPack, name,vehTypeKey);
}
}

107
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@ -52,9 +52,63 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid();
String orgPath = dto.getOrgPath();
List<UseDept> useDeptList = dto.getUseDeptList();
useDeptList.removeAll(Collections.singleton(null));
if (useDeptList.isEmpty()) {
return rb.setMsg("适用销售部门不允许为空");
}
if (StringUtils.isBlank(dto.getBankSid())) {
return rb.setMsg("资方不允许为空");
return rb.setMsg("资方简称不允许为空");
}
List<String> vehTypeKeyList = dto.getVehTypeKeyList();
vehTypeKeyList.removeAll(Collections.singleton(null));
if (vehTypeKeyList.isEmpty()) {
return rb.setMsg("车辆功能不允许为空");
}
String guaranteeTypeKey = dto.getGuaranteeTypeKey();
if (StringUtils.isBlank(guaranteeTypeKey)) {
return rb.setMsg("担保类型不允许为空");
}
//首付比例
if (StringUtils.isBlank(dto.getDownPayRatio())) {
return rb.setMsg("首付比例不允许为空");
}
//最低首付比例
if (StringUtils.isBlank(dto.getDownPayRatioLeast())) {
return rb.setMsg("最低首付比例不允许为空");
}
//保证金比例
if (StringUtils.isBlank(dto.getBondRatio())) {
return rb.setMsg("保证金比例不允许为空");
}
//保证金类型
if (StringUtils.isBlank(dto.getBondType())) {
return rb.setMsg("保证金类型不允许为空");
}
//期数
if(StringUtils.isBlank(dto.getPeriodKey())){
return rb.setMsg("期数不允许为空");
}
//标准年利率
if (StringUtils.isBlank(dto.getYearRatio())) {
return rb.setMsg("标准年利率不允许为空");
}
//服务费类型
if (StringUtils.isBlank(dto.getServiceAmountTypeValue())) {
return rb.setMsg("服务费类型不允许为空");
}
//服务费
if (StringUtils.isBlank(dto.getServiceAmount())) {
return rb.setMsg("服务费不允许为空");
}
//贴息放款类型
if (StringUtils.isBlank(dto.getDiscountUseType())) {
return rb.setMsg("贴息放款类型不允许为空");
}
if (StringUtils.isBlank(dto.getValidDateTo())) {
return rb.setMsg("有效期至不允许为空");
}
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
String useOrgName = "";
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
@ -64,7 +118,6 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
if (StringUtils.isBlank(sid)) {
LoanFinPolicy loanFinPolicy = new LoanFinPolicy();
BeanUtil.copyProperties(dto, loanFinPolicy, "sid");
List<String> vehTypeKeyList = dto.getVehTypeKeyList();
if (!vehTypeKeyList.isEmpty()) {
String vehTypeKey = String.join(",", vehTypeKeyList);
loanFinPolicy.setVehTypeKey(vehTypeKey);
@ -74,7 +127,6 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
String vehTypeValue = String.join(",", vehTypeValueList);
loanFinPolicy.setVehTypeValue(vehTypeValue);
}
List<UseDept> useDeptList = dto.getUseDeptList();
String deptSids = "";
String deptNames = "";
if (!useDeptList.isEmpty()) {
@ -131,6 +183,22 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
BeanUtil.copyProperties(dto, loanFinOtherPolicy, "sid");
LoanFinOtherPolicyDto loanFinOtherPolicyDto = dto.getLoanFinOtherPolicy();
BeanUtil.copyProperties(loanFinOtherPolicyDto, loanFinOtherPolicy);
//产品类别
if (StringUtils.isBlank(loanFinOtherPolicyDto.getProductTypeValue())) {
return rb.setMsg("其他融产品类别不允许为空");
}
//最高融资比例
if (StringUtils.isBlank(loanFinOtherPolicyDto.getMaxLoanRatio())) {
return rb.setMsg("其他融最高融资比例不允许为空");
}
//最高融资额
if (StringUtils.isBlank(loanFinOtherPolicyDto.getMaxLoanAmount())) {
return rb.setMsg("其他融最高融资额不允许为空");
}
//年利率
if (StringUtils.isBlank(loanFinOtherPolicyDto.getYearRatio())) {
return rb.setMsg("其他融年利率不允许为空");
}
//其它融名称=资方+产品类别+最高融资比例+期数
//其它融产品名称=资方简称+产品类别+期数+最高融资比例,如:中车首付贷 24 期20
String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue() + " " + loanFinOtherPolicy.getPeriod() + "期 ";
@ -165,7 +233,6 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
return rb.setMsg("该金融产品政策不存在");
}
BeanUtil.copyProperties(dto, loanFinPolicy, "sid");
List<String> vehTypeKeyList = dto.getVehTypeKeyList();
if (!vehTypeKeyList.isEmpty()) {
String vehTypeKey = String.join(",", vehTypeKeyList);
loanFinPolicy.setVehTypeKey(vehTypeKey);
@ -181,7 +248,6 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
}
String deptSids = "";
String deptNames = "";
List<UseDept> useDeptList = dto.getUseDeptList();
if (!useDeptList.isEmpty()) {
List<String> deptSidsList = useDeptList.stream().map(v -> v.getDeptSid()).collect(Collectors.toList());
deptSids = String.join(",", deptSidsList);
@ -213,13 +279,13 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
if (!vehTypeKeyList.isEmpty()) {
String vehTypeKey = String.join(",", vehTypeKeyList);
loanFinOtherPolicy.setVehTypeKey(vehTypeKey);
}else{
} else {
loanFinOtherPolicy.setVehTypeKey("");
}
if (!vehTypeValueList.isEmpty()) {
String vehTypeValue = String.join(",", vehTypeValueList);
loanFinOtherPolicy.setVehTypeValue(vehTypeValue);
}else{
} else {
loanFinOtherPolicy.setVehTypeValue("");
}
loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
@ -349,6 +415,16 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
if (loanFinPolicy == null) {
return rb.setMsg("选择中包含金融产品政策不存在的数据,请刷新后操作");
}
if("1".equals(query.getUseState())){//useState为1时走停用,为0时走开启
if(loanFinPolicy.getUseSate() == 1){
return rb.setMsg("该数据已是停用状态,不要重复操作");
}
}
if("0".equals(query.getUseState())){
if(loanFinPolicy.getUseSate() == 0){
return rb.setMsg("该数据已是开启状态,不要重复操作");
}
}
loanFinPolicy.setUseSate(Integer.valueOf(useState).intValue());
loanFinPolicy.setModifyTime(new Date());
loanFinPolicy.setUpdateBySid(query.getUserSid());
@ -477,6 +553,18 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
if (loanFinPolicy == null) {
return rb.setMsg("选择中包含金融产品政策不存在的数据,请刷新后操作");
}
if("1".equals(query.getRiskState())){//useState为1时走停用,为0时走开启
if(loanFinPolicy.getRiskState() == 1){
return rb.setMsg("该数据已是禁用状态,不要重复操作");
}
}
if("0".equals(query.getRiskState())){
if(loanFinPolicy.getRiskState() == 0){
return rb.setMsg("该数据已是启用状态,不要重复操作");
}
}
loanFinPolicy.setModifyTime(new Date());
loanFinPolicy.setUpdateBySid(query.getUserSid());
loanFinPolicy.setRiskState(Integer.valueOf(riskState).intValue());
baseMapper.updateById(loanFinPolicy);
LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(sid);
@ -572,10 +660,11 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
return rb.success().setData(appPolicyDetailsVo);
}
public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name) {
public ResultBean<List<PolicyVo>> selectList(String orgPath, String userSid, String isPack, String name,String vehTypeKey) {
ResultBean<List<PolicyVo>> rb = ResultBean.fireFail();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
List<PolicyVo> list = baseMapper.selectListOne(useOrgSid, isPack, name);
String deptSid = Arrays.asList(orgPath.split("/")).get(Arrays.asList(orgPath.split("/")).size()-1);
List<PolicyVo> list = baseMapper.selectListOne(deptSid, isPack, name,vehTypeKey);
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}

8
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java

@ -92,8 +92,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
if (!dto.getAnnexPaths().isEmpty()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : dto.getAnnexPaths()) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
String replace = filePath.replace(urlPrefix, "");
sb.append(replace).append(",");
}
sb.delete(sb.length() - 1, sb.length());
entity.setAnnexPath(sb.toString());
@ -131,8 +131,8 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService<LoanFinP
if (!dto.getAnnexPaths().isEmpty()) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
for (String filePath : dto.getAnnexPaths()) {
String path = filePath.substring(urlPrefix.length());
sb.append(path).append(",");
String replace = filePath.replace(urlPrefix, "");
sb.append(replace).append(",");
}
sb.delete(sb.length() - 1, sb.length());
entity.setAnnexPath(sb.toString());

73
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java

@ -1,31 +1,19 @@
package com.yxt.anrui.riskcenter.biz.loannoguaranteecreditreview;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReview;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo;
import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDto;
import com.yxt.anrui.riskcenter.api.loanparameter.*;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -43,12 +31,6 @@ import java.util.stream.Collectors;
@Service
public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanNoGuaranteeCreditReviewMapper, LoanNoGuaranteeCreditReview> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
@ -61,12 +43,8 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
public ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> details(String salesOrderSid) {
ResultBean<LoanNoGuaranteeCreditReviewDetailsVo> rb = ResultBean.fireFail();
LoanNoGuaranteeCreditReviewDetailsVo vo = new LoanNoGuaranteeCreditReviewDetailsVo();
vo.setSalesOrderSid(salesOrderSid);
LoanNoGuaranteeCreditReview entity = baseMapper.selectOneByOrderSid(salesOrderSid);
BeanUtil.copyProperties(entity, vo);
String sid = "";
if (StringUtils.isNotBlank(entity.getSid())) {
sid = entity.getSid();
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(salesOrderSid).getData();
if (null != busSalesOrder) {
if (StringUtils.isNotBlank(busSalesOrder.getStaffName())) {
@ -79,27 +57,34 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
vo.setBorrowerName(borrowerDetailsVo.getBorrowerName());
}
}
//家访考察结果截图
List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setHomeVisitFiles(homeVisitFiles);
}
//信审终审结果截图
fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setCreditReviewFiles(creditReviewFiles);
}
//放款审核结果截图
fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setLoanReviewFiles(loanReviewFiles);
if (null != entity) {
BeanUtil.copyProperties(entity, vo);
String sid = "";
if (StringUtils.isNotBlank(entity.getSid())) {
sid = entity.getSid();
}
//家访考察结果截图
List<LoanFile> fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.HOME_VISIT_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> homeVisitFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setHomeVisitFiles(homeVisitFiles);
}
//信审终审结果截图
fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.CREDIT_REVIEW_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> creditReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setCreditReviewFiles(creditReviewFiles);
}
//放款审核结果截图
fileList = loanFileService.selectByLinkSid(sid, LoanFileEnum.LOAN_REVIEW_FILES.getAttachType());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
List<String> loanReviewFiles = fileList.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).collect(Collectors.toList());
vo.setLoanReviewFiles(loanReviewFiles);
}
}
return rb.success().setData(vo);
}

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -599,10 +599,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
return rb.success();
} else {
loanOrderPreloanVo.setConfirmBtn("信用申诉");
return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过!");
loanOrderPreloanVo.setConfirmBtn("我知道了");
return rb.setData(loanOrderPreloanVo).setMsg("实际购车人信用申诉进行中,请等待!");
}
} else {
loanOrderPreloanVo.setSid(loanPreloanCreditApply.getSid());
loanOrderPreloanVo.setConfirmBtn("信用申诉");
return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过!");
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
@ -100,6 +101,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
return loanSolutionsService.details2(query);
}
@Override
public ResultBean<PushVo> selectMoney(String saleOrderSid) {
return loanSolutionsService.selectMoney(saleOrderSid);
}
/* @Override
public ResultBean<PagerVo<LoanSolutionsVo>> listPage(@RequestBody PagerQuery<LoanSolutionsQuery> pq) {
ResultBean rb = ResultBean.fireFail();

54
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@ -12,6 +12,7 @@ import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto;
import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
@ -1782,9 +1783,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//融资票据
StringBuilder accessoriesAmountValue = new StringBuilder();
if (StringUtils.isNotBlank(solutionssVo.getAccessoriesAmount())) {
if(!solutionssVo.isAccessoriesAmountCb()){
if (!solutionssVo.isAccessoriesAmountCb()) {
accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件:").append("0");
}else{
} else {
accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件:").append(solutionssVo.getAccessoriesAmount());
}
} else {
@ -1794,9 +1795,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//挂车
StringBuilder trailerAmountValue = new StringBuilder();
if (StringUtils.isNotBlank(solutionssVo.getTrailerAmount())) {
if(!solutionssVo.isTrailerAmountCb()){
if (!solutionssVo.isTrailerAmountCb()) {
trailerAmountValue = trailerAmountValue.append("\t").append("挂车:").append("0");
}else{
} else {
trailerAmountValue = trailerAmountValue.append("\t").append("挂车:").append(solutionssVo.getTrailerAmount());
}
} else {
@ -1808,7 +1809,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
if (StringUtils.isNotBlank(solutionssVo.getPremium())) {
if (!solutionssVo.isPremiumCb()) {
premiumValue = premiumValue.append("\t").append("保险:").append("0");
}else{
} else {
premiumValue = premiumValue.append("\t").append("保险:").append(solutionssVo.getPremium());
}
} else {
@ -1818,9 +1819,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//购置税
StringBuilder purchaseTaxValue = new StringBuilder();
if (StringUtils.isNotBlank(solutionssVo.getPurchaseTax())) {
if(!solutionssVo.isPurchaseTaxCb()){
if (!solutionssVo.isPurchaseTaxCb()) {
purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税:").append("0");
}else{
} else {
purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税:").append(solutionssVo.getPurchaseTax());
}
} else {
@ -2500,6 +2501,45 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
return rb.success().setData(solutionssVo);
}
public ResultBean<PushVo> selectMoney(String saleOrderSid) {
ResultBean<PushVo> rb = ResultBean.fireFail();
PushVo pushVo = new PushVo();
//融资放款=融资项目总额-融资首付-[贷款保证金]-[厂家贴息]
//根据选择的产品政策来判断,若贷款保证金为固定的,需要减去,若为敞口的,不需要减;
// 差额放款需要减厂家贴息,全额放款不需要。差额放款的厂家贴息金额存入“其他应收”字段中,
BigDecimal bg = BigDecimal.ZERO;
LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
if (loanSolutions != null) {
//根据产品政策sid查询
bg = bg.add(loanSolutions.getLoanTotal());
//查询融资首付
LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
if (loanSolutionsOtherpolicy != null) {
bg = bg.subtract(loanSolutionsOtherpolicy.getLoanDownPay());
}
//查询产品政策
LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
if (loanFinPolicy != null) {
if ("01".equals(loanFinPolicy.getBondTypeKey())) {//01固定
LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
if (loanSolutionsDetail != null) {
if (loanSolutionsDetail.getBondAmounts() != null) {
bg = bg.subtract(loanSolutionsDetail.getBondAmounts());
}
}
}
if ("01".equals(loanFinPolicy.getDiscountUseTypeKey())) {//01差额放款
if (loanSolutions.getFactoryDiscount() != null) {
bg = bg.subtract(loanSolutions.getFactoryDiscount());
pushVo.setOtherReceivableMoney(loanSolutions.getFactoryDiscountUse());
}
}
}
}
pushVo.setMoney(bg.toString());
return rb.success().setData(pushVo);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml

@ -20,4 +20,8 @@ spring:
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload/
url:
prefix: http://anrui.yyundong.com/upload/

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@ -290,7 +290,7 @@ public interface AppBusSalesOrderFeign {
@ResponseBody
ResultBean<VinNoVo> getVinList(@PathVariable("saleOrderSid") String saleOrderSid);
@ApiOperation("初始化|录入车架号列表")
@ApiOperation("初始化|录入车架号列表2")
@GetMapping("/init/saleOrderInputVin2/{saleOrderSid}")
@ResponseBody
ResultBean<VinNoVo2> getVinList2(@PathVariable("saleOrderSid") String saleOrderSid);
@ -325,5 +325,24 @@ public interface AppBusSalesOrderFeign {
@ResponseBody
ResultBean<OrderLoanVo> judgeIsLoan(@RequestParam("sid") String sid);
@ApiOperation("初始化录入贷款人列表")
@GetMapping("/init/saleOrderInputLender/{saleOrderSid}")
@ResponseBody
ResultBean<InputLenderVo> saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid);
@ApiOperation("删除销售订单贷款人")
@DeleteMapping("/delete/saleOrderInputLender/{sid}")
@ResponseBody
ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
@ApiOperation("保存销售订单贷款人数量")
@PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}")
@ResponseBody
ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid,@PathVariable("num")String num);
@ApiOperation("保存销售订单贷款人自己")
@PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}")
@ResponseBody
ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid);
}

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@ -290,4 +290,24 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
return null;
}
@Override
public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
return null;
}
@Override
public ResultBean deleteSaleOrderInputLender(String sid) {
return null;
}
@Override
public ResultBean saleOrderInputLenderNum(String sid, String num) {
return null;
}
@Override
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
return null;
}
}

30
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/InputLenderVo.java

@ -0,0 +1,30 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class InputLenderVo implements Vo {
private static final long serialVersionUID = -398449823642125912L;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("订单台数")
private Integer orderCarNum;
@ApiModelProperty("确认台数")
private Integer confirmCarNum;
@ApiModelProperty("是否显示自己:当贷款人没有本人时才显示,当确定的台数与总台数相同时,不允许显示")
private boolean showOwn;
@ApiModelProperty("是否显示选择按钮,当确定台数与总台数相同时,不允许显示")
private boolean showSelect;
private List<LenderListVo> lenderList = new ArrayList<>();
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LenderListVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2023/9/11
**/
@Data
public class LenderListVo implements Vo {
private static final long serialVersionUID = 2316054778495509308L;
@ApiModelProperty("数量")
private String vinNum;
@ApiModelProperty("记录sid")
private String sid;
@ApiModelProperty("贷款人")
private String lenderName;
@ApiModelProperty("是否显示删除:没确认可以删除")
private boolean showDelete;
@ApiModelProperty("是否显示确认,没确认可以确认")
private boolean showConfirm;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@ -63,4 +63,9 @@ public interface CommonFeign {
@GetMapping("/getLoanPreloan")
ResultBean<CarModelVo> getLoanPreloan(@RequestParam("orderSid") String orderSid);
@ApiOperation(value = "信用申诉页面")
@ResponseBody
@GetMapping("/getLoanSs")
ResultBean<CarModelVo> getLoanSs(@RequestParam("orderSid") String orderSid);
}

25
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@ -26,6 +26,7 @@
package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
@ -116,12 +117,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
@Override
@ApiOperation("重新提交")
public ResultBean rePublishSaleOrder(String saleOrderSid) throws InvocationTargetException, IllegalAccessException {
return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,"","","");
return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, "", "", "");
}
@Override
public ResultBean rePublishSaleOrder(String saleOrderSid, String customerSid, String customerName, String customerMobile) throws InvocationTargetException, IllegalAccessException {
return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid,customerSid,customerName,customerMobile);
return appBusSalesOrderService.rePublishSaleOrder(saleOrderSid, customerSid, customerName, customerMobile);
}
@Override
@ -383,4 +384,24 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
return appBusSalesOrderService.judgeIsLoan(sid);
}
@Override
public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
return appBusSalesOrderService.saleOrderInputLender(saleOrderSid);
}
@Override
public ResultBean deleteSaleOrderInputLender(String sid) {
return appBusSalesOrderService.deleteSaleOrderInputLender(sid);
}
@Override
public ResultBean saleOrderInputLenderNum(String sid, String num) {
return appBusSalesOrderService.saleOrderInputLenderNum(sid,num);
}
@Override
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
return appBusSalesOrderService.saleOrderInputLenderOwn(saleOrderSid);
}
}

26
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuer
import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.SalesLenderVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppBusSaleOrderInitModelInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
@ -76,6 +77,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo;
import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
@ -733,6 +735,9 @@ public class AppBusSalesOrderService {
if ("信用审核".equals(loanOrderPreloanVo.getConfirmBtn())) {
CarModelVo finPage1 = commonService.getLoanPreloan(sid).getData();
orderLoanVo.setPluginPage(finPage1);
} else if ("信用申诉".equals(loanOrderPreloanVo.getConfirmBtn())) {
CarModelVo finPage1 = commonService.getLoanSs(loanOrderPreloanVo.getSid()).getData();
orderLoanVo.setPluginPage(finPage1);
}
return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);
}
@ -747,4 +752,25 @@ public class AppBusSalesOrderService {
BeanUtil.copyProperties(vinVo, vinNoVo);
return rb.success().setData(vinNoVo);
}
public ResultBean<InputLenderVo> saleOrderInputLender(String saleOrderSid) {
ResultBean<InputLenderVo> rb = ResultBean.fireFail();
InputLenderVo inputLenderVo = new InputLenderVo();
ResultBean<SalesLenderVo> resultBean = busSalesOrderFeign.saleOrderInputLender(saleOrderSid);
SalesLenderVo vinVo = resultBean.getData();
BeanUtil.copyProperties(vinVo, inputLenderVo);
return rb.success().setData(inputLenderVo);
}
public ResultBean deleteSaleOrderInputLender(String sid) {
return busSalesOrderFeign.deleteSaleOrderInputLender(sid);
}
public ResultBean saleOrderInputLenderNum(String sid, String num) {
return busSalesOrderFeign.saveBorrowNum(sid,num);
}
public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
return busSalesOrderFeign.saleOrderInputLenderOwn(saleOrderSid);
}
}

5
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@ -63,4 +63,9 @@ public class CommonRest implements CommonFeign {
public ResultBean<CarModelVo> getLoanPreloan(String orderSid) {
return commonService.getLoanPreloan(orderSid);
}
@Override
public ResultBean<CarModelVo> getLoanSs(String orderSid) {
return commonService.getLoanSs(orderSid);
}
}

30
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@ -150,7 +150,7 @@ public class CommonService {
AppSubVersionVo appSubVersionVo = voResultBean.getData();
CarModelVo carModelVo = new CarModelVo();
Map<String, Object> map = new HashMap<>();
map.put("creditType",0);
map.put("creditType", 0);
map.put("createSource", 2);
map.put("sourceSid", orderSid);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
@ -171,4 +171,32 @@ public class CommonService {
carModelVo.setARouterParamValue(aRouterParamValue);
return rb.success().setData(carModelVo);
}
public ResultBean<CarModelVo> getLoanSs(String orderSid) {
ResultBean<CarModelVo> rb = ResultBean.fireFail();
String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c";
String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity3";
ResultBean<AppSubVersionVo> voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction);
AppSubVersionVo appSubVersionVo = voResultBean.getData();
CarModelVo carModelVo = new CarModelVo();
Map<String, Object> map = new HashMap<>();
map.put("creditType", 2);
map.put("sid", orderSid);
map.put("addNew", true);
appSubVersionVo.setJson(JSONObject.toJSONString(map));
BeanUtil.copyProperties(appSubVersionVo, carModelVo);
carModelVo.setRequestCode("1005");
carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager");
carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY3");
List<String> aRouterParamType = new ArrayList<>();
aRouterParamType.add("INT");
aRouterParamType.add("BOOLEAN");
List<String> aRouterParamValue = new ArrayList<>();
aRouterParamValue.add("2");
aRouterParamValue.add(orderSid);
aRouterParamValue.add("true");
carModelVo.setARouterParamType(aRouterParamType);
carModelVo.setARouterParamValue(aRouterParamValue);
return rb.success().setData(carModelVo);
}
}

Loading…
Cancel
Save