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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
55964a2ca6 f1c9f64978
commit
eb1b29a1e8
12 changed files with 442 additions and 76 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. 46
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFL.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  3. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  4. 42
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderSourceLCVo.java
  5. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
  6. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  7. 377
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  8. 23
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  9. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java
  10. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml
  11. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
  12. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java

46
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFL.java
View File

@ -0,0 +1,46 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class BusSalesOrderFL implements Vo {
@ApiModelProperty(value = "返利金额")
private String flPrice;
@ApiModelProperty(value = "户名")
private String hm;
@ApiModelProperty(value = "手机号")
private String sjh;
@ApiModelProperty(value = "账号")
private String zh;
@ApiModelProperty(value = "开户行")
private String khh;
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
View File

@ -283,4 +283,9 @@ public interface BusSalesOrderFeign {
@GetMapping("/selectOrderOne")
@ResponseBody
ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(@RequestParam("vinSid")String vinSid);
@ApiOperation("生成销售订单PDF")
@PostMapping("/createPdf")
@ResponseBody
public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
View File

@ -259,4 +259,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(String vinSid) {
return null;
}
@Override
public ResultBean createPdf(String sid, String userName) {
return null;
}
}

42
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderSourceLCVo.java
View File

@ -0,0 +1,42 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.api.bussalesorder;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class BusSalesOrderSourceLCVo implements Vo {
@ApiModelProperty(value = "审批人姓名")
private String name;
@ApiModelProperty(value = "审批人意见")
private String comment;
@ApiModelProperty(value = "审批时间")
private String spsj;
}

3
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
View File

@ -129,5 +129,8 @@ public class AppOrderDetailsVo implements Vo {
@ApiModelProperty("金融方案费用明细")
private String detailLoanSolutions;
@ApiModelProperty("是否有金融方案")
private boolean finState;
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
View File

@ -338,4 +338,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
public ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(String vinSid) {
return busSalesOrderService.selectOrderOne(vinSid);
}
@Override
public ResultBean createPdf(String sid, String userName) {
return busSalesOrderService.createPdf(sid,userName);
}
}

377
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -35,21 +35,26 @@ import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitF
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehicle.BusMainDepositUpdateQuery;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesDetailsVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
@ -119,6 +124,8 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo;
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto;
@ -131,11 +138,14 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
@ -146,8 +156,10 @@ import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.base.utils.DateUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.WordUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -167,6 +179,8 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import static java.util.Comparator.comparing;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderService.java <br/>
@ -211,6 +225,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
@ -261,6 +277,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
@Autowired
private LoanSolutionsFeign loanSolutionsFeign;
@Autowired
private SysStaffinfoFeign sysStaffinfoFeign;
/**
* 构造查询条件
@ -332,6 +350,40 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(entity.getUseOrgSid()).getData();
vo.setUseOrgName(sysOrganizationVo.getName());
/***************************车型信息***************************************/
AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
if (modelInfo != null) {
//若前端传值的订单类型为0则为现车，为1采购订单，为2排产
//数据库中1为现车，2为采购订单，3为排产
if ("0".equals(modelInfo.getType())) {
//查询车架号
// List<String> vinList = busSalesOrderVehicleService.selectList(sid);
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
modelInfo.setVinList(vinList);
modelInfo.setOrderVinList(orderVinList);
} else {
if ("1".equals(modelInfo.getType())) {
//查询采购订单编号
// List<String> stringList = busSalesVehicleOrderService.selectList(sid);
List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
//包含采购系统的采购订单编号
List<String> stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList());
List<String> orderStringList = busSalesVehicleOrderService.selectList(sid);
modelInfo.setOrderList(stringList);
modelInfo.setOrderStringList(orderStringList);
}
}
List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid);
modelInfo.setVinListsVos(vinListVoList);
ResultBean<String> images = baseVehicleModelAppendixFeign.selectImage(modelInfo.getModelSid());
if (images.getSuccess()) {
modelInfo.setModelImage(images.getData());
}
//vo.setModelInfo(modelInfo);
}
/*************************************************补充说明附件*****************************************************/
String imagesFile = entity.getImagesFile();
if (StringUtils.isNotBlank(imagesFile)) {
@ -3271,6 +3323,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setDepositInfo(depositInfo);
}
/****************************金融方案***************************************/
if("2".equals(busSalesOrder.getPayTypeKey())){
vo.setFinState(true);
}else{
if("1".equals(busSalesOrder.getFinancePlan())){
vo.setFinState(false);
}else{
vo.setFinState(true);
}
}
vo = selectSolution(vo, sid);
return rb.success().setData(vo);
}
@ -3453,37 +3514,43 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (solutionsDetailsVo.isOtherPolicyState()) {
//其它融名称
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyName())) {
otherLoanSolutions = loanSolutions.append("其它融名称：").append(solutionsDetailsVo.getOtherPolicyName());
otherLoanSolutions = otherLoanSolutions.append("其它融名称：").append(solutionsDetailsVo.getOtherPolicyName());
} else {
otherLoanSolutions = loanSolutions.append("其它融名称：").append("-");
otherLoanSolutions = otherLoanSolutions.append("其它融名称：").append("-");
}
//贷款金额
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyAmount())) {
otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append(solutionsDetailsVo.getOtherPolicyAmount());
otherLoanSolutions = otherLoanSolutions.append("、").append("贷款金额：").append(solutionsDetailsVo.getOtherPolicyAmount());
} else {
otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append("-");
otherLoanSolutions = otherLoanSolutions.append("、").append("贷款金额：").append("-");
}
//期数
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyPeriod())) {
otherLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getOtherPolicyPeriod());
otherLoanSolutions = otherLoanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getOtherPolicyPeriod());
} else {
otherLoanSolutions = loanSolutions.append("、").append("期数：").append("-");
otherLoanSolutions = otherLoanSolutions.append("、").append("期数：").append("-");
}
//月还金额
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyMonthlyRepay())) {
otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getOtherPolicyMonthlyRepay());
otherLoanSolutions = otherLoanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getOtherPolicyMonthlyRepay());
} else {
otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-");
otherLoanSolutions = otherLoanSolutions.append("、").append("月还金额：").append("-");
}
//利息总额
if(StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyInterest())){
otherLoanSolutions = otherLoanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getOtherPolicyInterest());
}else{
otherLoanSolutions = otherLoanSolutions.append("、").append("利息总额：").append("-");
}
//年利率
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyYearRatio())) {
otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getOtherPolicyYearRatio());
} else {
otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-");
otherLoanSolutions = otherLoanSolutions.append("、").append("年利率：").append("-");
}
} else {
otherLoanSolutions = otherLoanSolutions.append("-");
@ -3492,169 +3559,169 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//==========================方案汇总
//融资首付
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanDownPay())) {
allLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getLoanDownPay());
allLoanSolutions = allLoanSolutions.append("融资首付：").append(solutionsDetailsVo.getLoanDownPay());
} else {
allLoanSolutions = loanSolutions.append("融资首付：").append("-");
allLoanSolutions = allLoanSolutions.append("融资首付：").append("-");
}
//总贷款金额
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanAmountTotal())) {
allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append(solutionsDetailsVo.getLoanAmountTotal());
allLoanSolutions = allLoanSolutions.append("、").append("总贷款金额：").append(solutionsDetailsVo.getLoanAmountTotal());
} else {
allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append("-");
allLoanSolutions = allLoanSolutions.append("、").append("总贷款金额：").append("-");
}
//期数
if (StringUtils.isNotBlank(solutionsDetailsVo.getPeriod())) {
allLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getPeriod());
allLoanSolutions = allLoanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getPeriod());
} else {
allLoanSolutions = loanSolutions.append("、").append("期数：").append("-");
allLoanSolutions = allLoanSolutions.append("、").append("期数：").append("-");
}
//月还金额
if (StringUtils.isNotBlank(solutionsDetailsVo.getMonthlyRepay())) {
allLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getMonthlyRepay());
allLoanSolutions = allLoanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getMonthlyRepay());
} else {
allLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-");
allLoanSolutions = allLoanSolutions.append("、").append("月还金额：").append("-");
}
//利息总额
if (StringUtils.isNotBlank(solutionsDetailsVo.getInterest())) {
allLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getInterest());
allLoanSolutions = allLoanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getInterest());
} else {
allLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-");
allLoanSolutions = allLoanSolutions.append("、").append("利息总额：").append("-");
}
//预计首期还款日
if (StringUtils.isNotBlank(solutionsDetailsVo.getReturnTime())) {
allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append(solutionsDetailsVo.getReturnTime());
allLoanSolutions = allLoanSolutions.append("、").append("预计首期还款日：").append(solutionsDetailsVo.getReturnTime());
} else {
allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append("-");
allLoanSolutions = allLoanSolutions.append("、").append("预计首期还款日：").append("-");
}
//=========================应收明细
//融资首付
if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmounts())) {
detailLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getDownPayAmounts());
detailLoanSolutions = detailLoanSolutions.append("融资首付：").append(solutionsDetailsVo.getDownPayAmounts());
} else {
detailLoanSolutions = loanSolutions.append("融资首付：").append("-");
detailLoanSolutions = detailLoanSolutions.append("融资首付：").append("-");
}
//贷款保证金
if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmounts())) {
detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmounts());
detailLoanSolutions = detailLoanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmounts());
} else {
detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("贷款保证金：").append("-");
}
//保险保证金
if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositPremium())) {
detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append(solutionsDetailsVo.getDepositPremium());
detailLoanSolutions = detailLoanSolutions.append("、").append("保险保证金：").append(solutionsDetailsVo.getDepositPremium());
} else {
detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("保险保证金：").append("-");
}
//落户保证金
if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositSettle())) {
detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append(solutionsDetailsVo.getDepositSettle());
detailLoanSolutions = detailLoanSolutions.append("、").append("落户保证金：").append(solutionsDetailsVo.getDepositSettle());
} else {
detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("落户保证金：").append("-");
}
//服务费
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
detailLoanSolutions = loanSolutions.append("、").append("服务费：").append(solutionsDetailsVo.getServiceAmount());
detailLoanSolutions = detailLoanSolutions.append("、").append("服务费：").append(solutionsDetailsVo.getServiceAmount());
} else {
detailLoanSolutions = loanSolutions.append("、").append("服务费：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("服务费：").append("-");
}
//代收意外险
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyAccidentPremium())) {
detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append(solutionsDetailsVo.getProxyAccidentPremium());
detailLoanSolutions = detailLoanSolutions.append("、").append("代收意外险：").append(solutionsDetailsVo.getProxyAccidentPremium());
} else {
detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("代收意外险：").append("-");
}
//上牌费
if (StringUtils.isNotBlank(solutionsDetailsVo.getRegisterAmount())) {
detailLoanSolutions = loanSolutions.append("、").append("运管费：").append(solutionsDetailsVo.getRegisterAmount());
detailLoanSolutions = detailLoanSolutions.append("、").append("上牌费：").append(solutionsDetailsVo.getRegisterAmount());
} else {
detailLoanSolutions = loanSolutions.append("、").append("运管费：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("上牌费：").append("-");
}
//运管费
if (StringUtils.isNotBlank(solutionsDetailsVo.getOperationAmount())) {
detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append(solutionsDetailsVo.getPolicyName());
detailLoanSolutions = detailLoanSolutions.append("、").append("运管费：").append(solutionsDetailsVo.getOperationAmount());
} else {
detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("运管费：").append("-");
}
//补车价
if (StringUtils.isNotBlank(solutionsDetailsVo.getVehOtherPrice())) {
detailLoanSolutions = loanSolutions.append("、").append("补车价：").append(solutionsDetailsVo.getVehOtherPrice());
detailLoanSolutions = detailLoanSolutions.append("、").append("补车价：").append(solutionsDetailsVo.getVehOtherPrice());
} else {
detailLoanSolutions = loanSolutions.append("、").append("补车价：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("补车价：").append("-");
}
//其它费用
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmount())) {
detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append(solutionsDetailsVo.getOtherAmount());
detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用：").append(solutionsDetailsVo.getOtherAmount());
} else {
detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用：").append("-");
}
//其它费用说明
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmountRemark())) {
detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append(solutionsDetailsVo.getOtherAmountRemark());
detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用说明：").append(solutionsDetailsVo.getOtherAmountRemark());
} else {
detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("其它费用说明：").append("-");
}
//办理方式选择
if (StringUtils.isNotBlank(solutionsDetailsVo.getDealWay())) {
detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append(solutionsDetailsVo.getDealWay());
detailLoanSolutions = detailLoanSolutions.append("、").append("办理方式选择：").append(solutionsDetailsVo.getDealWay());
} else {
detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("办理方式选择：").append("-");
}
//代收首年保险费
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPremium())) {
detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append(solutionsDetailsVo.getProxyPremium());
detailLoanSolutions = detailLoanSolutions.append("、").append("代收首年保险费：").append(solutionsDetailsVo.getProxyPremium());
} else {
detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("代收首年保险费：").append("-");
}
//代收购置税
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPurchasetax())) {
detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append(solutionsDetailsVo.getProxyPurchasetax());
detailLoanSolutions = detailLoanSolutions.append("、").append("代收购置税：").append(solutionsDetailsVo.getProxyPurchasetax());
} else {
detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("代收购置税：").append("-");
}
//应收合计
if (StringUtils.isNotBlank(solutionsDetailsVo.getReceivableTotal())) {
detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append(solutionsDetailsVo.getReceivableTotal());
detailLoanSolutions = detailLoanSolutions.append("、").append("应收合计：").append(solutionsDetailsVo.getReceivableTotal());
} else {
detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("应收合计：").append("-");
}
//抵顶费用合计
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetTotal())) {
detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append(solutionsDetailsVo.getOffsetTotal());
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶费用合计：").append(solutionsDetailsVo.getOffsetTotal());
} else {
detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶费用合计：").append("-");
}
//抵顶首年保险费
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPremium())) {
detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append(solutionsDetailsVo.getOffsetPremium());
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶首年保险费：").append(solutionsDetailsVo.getOffsetPremium());
} else {
detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶首年保险费：").append("-");
}
//抵顶购置税
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPurchasetax())) {
detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append(solutionsDetailsVo.getOffsetPurchasetax());
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶购置税：").append(solutionsDetailsVo.getOffsetPurchasetax());
} else {
detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("抵顶购置税：").append("-");
}
//实收合计
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append(solutionsDetailsVo.getRealTotal());
detailLoanSolutions = detailLoanSolutions.append("、").append("实收合计：").append(solutionsDetailsVo.getRealTotal());
} else {
detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("实收合计：").append("-");
}
//车辆总价
if (StringUtils.isNotBlank(solutionsDetailsVo.getVehTotalPrice())) {
detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append(solutionsDetailsVo.getVehTotalPrice());
detailLoanSolutions = detailLoanSolutions.append("、").append("车辆总价：").append(solutionsDetailsVo.getVehTotalPrice());
} else {
detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("车辆总价：").append("-");
}
//名义留购价
if (StringUtils.isNotBlank(solutionsDetailsVo.getNominalPrice())) {
detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append(solutionsDetailsVo.getNominalPrice());
detailLoanSolutions = detailLoanSolutions.append("、").append("名义留购价：").append(solutionsDetailsVo.getNominalPrice());
} else {
detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append("-");
detailLoanSolutions = detailLoanSolutions.append("、").append("名义留购价：").append("-");
}
@ -4932,4 +4999,186 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
public ResultBean createPdf(String sid, String userName) {
ResultBean rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = fetchBySid(sid);
Map<String, Object> dataMap = new HashMap();
//获取创建人姓名
String createBySid = busSalesOrder.getCreateBySid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(createBySid).getData();
String createByName = sysStaffinfoFeign.fetchBySid(sysUserVo.getStaffSid()).getData().getName();
//获取分公司名称
SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(busSalesOrder.getUseOrgSid()).getData();
String createOrgName = sysOrganization.getName();
//获取创建部门
List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(sysUserVo.getStaffSid()).getData();
StringBuilder deptName = new StringBuilder();
for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
//部门名称
String deptOrgName = sysStaffOrgVo.getOrgName();
String deptOrgSid = sysStaffOrgVo.getOrgSid();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(deptOrgSid).getData();
String psid = sysOrganizationVo.getPsid();
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(psid).getData();
String orgName = sysOrganizationVo1.getName();
String psid1 = sysOrganizationVo1.getPsid();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(psid1).getData();
String pname = sysOrganizationVo2.getName();
deptName.append(pname).append("-").append(orgName).append("-").append(deptOrgName).append(" ");
}
//获取审批编号
dataMap.put("billNo", busSalesOrder.getBillNo());
//获取审批记录
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData();
flowRecordVo.sort(comparing(PCHistTaskListAndCommentList::getTime));
List<BusSalesOrderSourceLCVo> busSalesOrderSourceLCVos = new ArrayList<>();
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
if (flowTask.getFlowableRecordVo() != null) {
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo();
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos");
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment");
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
String comment1 = (String) comment.get("comment");
busSalesOrderSourceLCVo.setName(assigneeName);
busSalesOrderSourceLCVo.setComment(comment1);
busSalesOrderSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString());
busSalesOrderSourceLCVos.add(busSalesOrderSourceLCVo);
} else {
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo();
BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo();
busSalesOrderSourceLCVo.setName(processCommentVo.get("title").toString());
busSalesOrderSourceLCVo.setComment(processCommentVo.get("content").toString());
busSalesOrderSourceLCVo.setSpsj(processCommentVo.get("time").toString());
busSalesOrderSourceLCVos.add(busSalesOrderSourceLCVo);
}
}
dataMap.put("lcList", busSalesOrderSourceLCVos);
//创建时间
dataMap.put("time", DateUtil.format(busSalesOrder.getCreateTime(), "yyyy-MM-dd"));
//创建人
dataMap.put("userSid", createByName);
//创建部门
dataMap.put("deptName", deptName);
//分公司名称
dataMap.put("orgName", createOrgName);
//客户名称
dataMap.put("custName", busSalesOrder.getCustomerName());
//联系电话
dataMap.put("phone", busSalesOrder.getMobile());
//销售类型
dataMap.put("saleType", busSalesOrder.getPayType());
//车型
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
dataMap.put("vehModel", busSalesOrderModel.getModelName());
//销售指导价
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
dataMap.put("salePrice", busSalesOrderPrice.getSingleGuildPrice());
//合同价格
CommonContract commonContract = commonContractFeign.selectByNo(busSalesOrder.getContractNo()).getData();
dataMap.put("conPrice", commonContract.getContractAmount());
//是否公司入保
BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.selectOrderInsuranceStateBySid(busSalesOrder.getSid());
if (busSalesOrder.getIsInsurance().equals("0")){
dataMap.put("isrb", "否，" + busSalesOrderInsuranceDetailsVo.getRemarks() + "。");
}else {
dataMap.put("isrb", "是，" + busSalesOrderInsuranceDetailsVo.getInsuranceName() + "，" + "单台预估金额" + busSalesOrderInsuranceDetailsVo.getInsuranceCarMoney() + "元，" + "入保期数" + busSalesOrderInsuranceDetailsVo.getInsuranceNum() + "。");
}
//是否赠送客户物品
List<AppOrderDiscountListVo> appOrderDiscountListVos = busSalesOrderDiscountService.selectDiscount(busSalesOrder.getSid());
if (appOrderDiscountListVos.size() == 0){
dataMap.put("iszs", "否");
//赠送客户物品
dataMap.put("zskhwp", "无");
}else {
dataMap.put("iszs", "是");
//赠送客户物品
String zskhwp = "";
for (AppOrderDiscountListVo appOrderDiscountListVo : appOrderDiscountListVos) {
zskhwp = zskhwp + appOrderDiscountListVo.getDiscountExplain() + "，" + "数量" + appOrderDiscountListVo.getNumber() + "，价值" + appOrderDiscountListVo.getTotal() + "元。 ";
}
dataMap.put("zskhwp", zskhwp);
}
//是否返利
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid());
dataMap.put("isfl", busSalesOrderSubmit == null ? "否" : "是");
//返利备案表
List<BusSalesOrderFL> busSalesOrderFLS = new ArrayList<>();
//价格信息中获取数量
Integer quantity = busSalesOrderPrice.getQuantity();
//中介人1
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())){
BusSalesOrderFL busSalesOrderFL = new BusSalesOrderFL();
//中介人1返利总金额
busSalesOrderFL.setFlPrice(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(quantity)).toString());
//中介人1户名
busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorUnit());
//中介人1手机号
busSalesOrderFL.setSjh(busSalesOrderSubmit.getDistributorMobile());
//中介人1信息
BaseMiddlemanDetailsVo baseMiddlemanDetailsOneVo = baseMiddlemanFeign.fetchDetailsBySid(busSalesOrderSubmit.getDistributorSid()).getData();
//中介人1账号
busSalesOrderFL.setZh(baseMiddlemanDetailsOneVo.getBankAccount());
//中介人1开户行
busSalesOrderFL.setKhh(baseMiddlemanDetailsOneVo.getBankName());
busSalesOrderFLS.add(busSalesOrderFL);
}else if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorNameTwo())){//中介人2
BusSalesOrderFL busSalesOrderFL = new BusSalesOrderFL();
//中介人2返利总金额
busSalesOrderFL.setFlPrice(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(quantity)).toString());
//中介人2户名
busSalesOrderFL.setHm(busSalesOrderSubmit.getDistributorUnitTwo());
//中介人2手机号
busSalesOrderFL.setSjh(busSalesOrderSubmit.getDistributorMobileTwo());
//中介人2信息
BaseMiddlemanDetailsVo baseMiddlemanDetailsTwoVo = baseMiddlemanFeign.fetchDetailsBySid(busSalesOrderSubmit.getDistributorSidTwo()).getData();
//中介人2账号
busSalesOrderFL.setZh(baseMiddlemanDetailsTwoVo.getBankAccount());
//中介人2开户行
busSalesOrderFL.setKhh(baseMiddlemanDetailsTwoVo.getBankName());
busSalesOrderFLS.add(busSalesOrderFL);
}
dataMap.put("flList", busSalesOrderFLS);
//金融信息备案
//资方
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
dataMap.put("zf", solutionsDetailsVo.getPolicyName());
//贴息金额
dataMap.put("txPrice", solutionsDetailsVo.getFactoryDiscount());
//贴息用途
dataMap.put("txyt", solutionsDetailsVo.getFactoryDiscountUse());
//金融服务费
dataMap.put("jrfwf", solutionsDetailsVo.getServiceAmount());
//备注
dataMap.put("bz", busSalesOrder.getNotes());
//获取图片路径
List<String> photoList = new ArrayList<>();
if (StringUtils.isNotBlank(busSalesOrder.getImagesFile())){
String notesImage = busSalesOrder.getImagesFile();
String[] notesImages = notesImage.split(",");
for (String image : notesImages) {
String urlPrefix = fileUploadComponent.getUrlPrefix();
image = urlPrefix + image;
photoList.add(image);
}
}
dataMap.put("photoPath64", photoList);
//获取模板
//模板路径
String sourcePath = "D:\\anrui\\upload\\template\\";
//生成word文件名
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
// 生成文件路径
String targetPath = sourcePath + dateStr;
WordUtils.creatWord(dataMap, "xsddsp", sourcePath, targetPath, typeName);
//新生成的word路径
String wordPath = targetPath + "\\" + typeName;
//生成出门证文件名
String pdfName = "销售订单审批_" + dateStr + seconds + ".pdf";
WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
return rb.success();
}
}

23
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
View File

@ -15,6 +15,7 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -77,7 +78,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
}
return rb.success().setData(solutionsDetailsVo);
}
@Transactional(rollbackFor = Exception.class)
public ResultBean saveDto(SolutionsDto dto) {
ResultBean rb = ResultBean.fireFail();
//查询金融方案
@ -204,7 +205,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
downPayAmount = downPayAmount.add(new BigDecimal(dto.getDownPayAmount()));
//首付款比例
String downPayRatio = "";
BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal downPayRatio1 = downPayAmount.divide(loanTotal,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
downPayRatio = downPayRatio1.toString() + "%";
//产品贷款金额 = 融资项目总额-首付金额
loanAmount = loanTotal.subtract(downPayAmount);
@ -228,7 +229,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BigDecimal bondAmount = new BigDecimal(dto.getBondAmount());
//贷款保证金比例
String bondRatio = "";
BigDecimal bondRatio1 = bondAmount.divide(loanAmount,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal bondRatio1 = bondAmount.divide(loanAmount,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
bondRatio = bondRatio1.toString() + "%";
loanSolutions.setBondAmount(bondAmount);
loanSolutions.setBondRatio(bondRatio);
@ -266,7 +267,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
String loanInterest = dto.getLoanInterest();
if (StringUtils.isNotBlank(loanInterest)) {
loanSolutions.setLoanInterest(new BigDecimal(loanInterest));
interest.add(new BigDecimal(loanInterest));
interest = interest.add(new BigDecimal(loanInterest));
} else {
loanSolutions.setLoanInterest(BigDecimal.ZERO);
}
@ -377,11 +378,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BigDecimal downPayAmounts = new BigDecimal(BigInteger.ZERO);
downPayAmounts = downPayAmounts.add(downPayAmount).subtract(otherPolicyAmount1);
loanSolutionsDetail.setDownPayAmounts(downPayAmounts);
receivableTotal = receivableTotal.add(downPayAmounts);
//贷款保证金
String bondAmounts = dto.getBondAmounts();
if (StringUtils.isNotBlank(bondAmounts)) {
receivableTotal = receivableTotal.add(new BigDecimal(bondAmounts));
loanSolutionsDetail.setBondAmounts(new BigDecimal(bondAmounts));
if (StringUtils.isNotBlank(dto.getBondAmount())) {
receivableTotal = receivableTotal.add(new BigDecimal(dto.getBondAmount()));
loanSolutionsDetail.setBondAmounts(new BigDecimal(dto.getBondAmount()));
} else {
loanSolutionsDetail.setBondAmounts(BigDecimal.ZERO);
}
@ -396,7 +397,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
//落户保证金
String depositSettle = dto.getDepositSettle();
if (StringUtils.isNotBlank(depositSettle)) {
receivableTotal = receivableTotal.add(new BigDecimal(depositPremium));
receivableTotal = receivableTotal.add(new BigDecimal(depositSettle));
loanSolutionsDetail.setDepositSettle(new BigDecimal(depositSettle));
} else {
loanSolutionsDetail.setDepositSettle(BigDecimal.ZERO);
@ -515,12 +516,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
loanSolutionsDetailService.insert(loanSolutionsDetail);
} else {//外部金融的只需要录入厂家贴息
//查询金融方案
loanSolutions = new LoanSolutions();
if(StringUtils.isNotBlank(dto.getTypeKey())){
loanSolutions.setType(dto.getType());
loanSolutions.setTypeKey(dto.getTypeKey());
}
//查询金融方案
loanSolutions = new LoanSolutions();
if (StringUtils.isBlank(dto.getFactoryDiscount())) {
loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
}else{

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.java
View File

@ -67,6 +67,5 @@ public interface ScmApplyInboundQueryMapper extends BaseMapper<ScmApplyInboundQu
@Update("update scm_apply_inbound_query set downNum = #{downNum},newDownDate = NOW() where sid = #{cgrkdSid}")
void updateDown(@Param("cgrkdSid") String cgrkdSid, @Param("downNum") String downNum);
@Select("select count(*) from scm_apply_inbound_query where applicationCode like %#{applicationCode}%")
Integer fetchByApplicationCode(String applicationCode);
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml
View File

@ -18,4 +18,10 @@
${ew.sqlSegment}
</where>
</select>
<select id="fetchByApplicationCode" resultType="java.lang.Integer">
select count(*)
from scm_apply_inbound_query
where applicationCode LIKE concat(#{applicationCode}, '%')
</select>
</mapper>

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java
View File

@ -101,5 +101,8 @@ public class OrderDetailsVo implements Vo {
@ApiModelProperty("金融方案费用明细")
private String detailLoanSolutions;
@ApiModelProperty("是否有金融方案")
private boolean finState;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
View File

@ -83,6 +83,8 @@ public class AppSolutionsDto implements Dto {
private String otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额")
private String otherPolicyInterest;
@ApiModelProperty("其它融年利率")
private String otherPolicyYearRatio;
@ApiModelProperty("'融资首付")
private String loanDownPay;

Write Preview
Loading…
Cancel
Save