diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFL.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFL.java new file mode 100644 index 0000000000..b0e4300108 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFL.java @@ -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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 2d33768021..8ed9ea234b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -283,4 +283,9 @@ public interface BusSalesOrderFeign { @GetMapping("/selectOrderOne") @ResponseBody ResultBean selectOrderOne(@RequestParam("vinSid")String vinSid); + + @ApiOperation("生成销售订单PDF") + @PostMapping("/createPdf") + @ResponseBody + public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 5c69fb0de9..cfef3ac5ce 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -259,4 +259,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean selectOrderOne(String vinSid) { return null; } + + @Override + public ResultBean createPdf(String sid, String userName) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderSourceLCVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderSourceLCVo.java new file mode 100644 index 0000000000..fbe51a2733 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderSourceLCVo.java @@ -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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 9d97445fc7..da27f5468d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -129,5 +129,8 @@ public class AppOrderDetailsVo implements Vo { @ApiModelProperty("金融方案费用明细") private String detailLoanSolutions; + @ApiModelProperty("是否有金融方案") + private boolean finState; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 6efb2af5b0..b794ecd9e7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -338,4 +338,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean selectOrderOne(String vinSid) { return busSalesOrderService.selectOrderOne(vinSid); } + + @Override + public ResultBean createPdf(String sid, String userName) { + return busSalesOrderService.createPdf(sid,userName); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index ec915028fc..4382b6e06f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -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(业务管理)
* File: BusSalesOrderService.java
@@ -211,6 +225,8 @@ public class BusSalesOrderService extends MybatisBaseService vinList = busSalesOrderVehicleService.selectList(sid); + List vinLists = busSalesOrderVehicleService.selectLists(sid); + //包含采购系统的车架号 + List vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); + List orderVinList = busSalesOrderVehicleService.selectList(sid); + modelInfo.setVinList(vinList); + modelInfo.setOrderVinList(orderVinList); + } else { + if ("1".equals(modelInfo.getType())) { + //查询采购订单编号 +// List stringList = busSalesVehicleOrderService.selectList(sid); + List stringLists = busSalesVehicleOrderService.selectLists(sid); + //包含采购系统的采购订单编号 + List stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList()); + List orderStringList = busSalesVehicleOrderService.selectList(sid); + modelInfo.setOrderList(stringList); + modelInfo.setOrderStringList(orderStringList); + } + } + List vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid); + modelInfo.setVinListsVos(vinListVoList); + ResultBean 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 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 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 flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData(); + flowRecordVo.sort(comparing(PCHistTaskListAndCommentList::getTime)); + List busSalesOrderSourceLCVos = new ArrayList<>(); + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + Map 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 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 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 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 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(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index 253049b273..2874a2883a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -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 + + \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index ae0f7b0b1e..7591c219dd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -101,5 +101,8 @@ public class OrderDetailsVo implements Vo { @ApiModelProperty("金融方案费用明细") private String detailLoanSolutions; + @ApiModelProperty("是否有金融方案") + private boolean finState; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java index 2e2286459a..8ce4cc677a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java @@ -83,6 +83,8 @@ public class AppSolutionsDto implements Dto { private String otherPolicyMonthlyRepay; @ApiModelProperty("其它融利息总额") private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; @ApiModelProperty("'融资首付") private String loanDownPay;