|
|
|
@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.google.common.util.concurrent.ThreadFactoryBuilder; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAppendix; |
|
|
|
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.*; |
|
|
|
@ -856,9 +855,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
//查询销售订单的现车
|
|
|
|
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
List<String> stringList = orderModelInfoVo.getVinList(); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
/*if (stringList.size() > 0) { |
|
|
|
map.put("vinNo", String.join(",", stringList)); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
String ftl = "receiveCar"; |
|
|
|
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); |
|
|
|
//生成word文件名
|
|
|
|
@ -941,7 +940,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
private String getCarFin(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) { |
|
|
|
String url = ""; |
|
|
|
//查询销售订单的现车
|
|
|
|
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
/*AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); |
|
|
|
AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); |
|
|
|
String singleFinalPrice = priceInfo.getSingleFinalPrice(); |
|
|
|
@ -955,7 +954,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
List<String> stringList = orderModelInfoVo.getVinList(); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
map.put("vinNo", String.join(",", stringList)); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//车款：money,大写：moneyDx
|
|
|
|
String ftl = "carFin"; |
|
|
|
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); |
|
|
|
@ -980,14 +979,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
private String getMoneyFin(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) { |
|
|
|
String url = ""; |
|
|
|
//查询销售订单的现车
|
|
|
|
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
/* AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); |
|
|
|
AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo(); |
|
|
|
String singleFinalPrice = priceInfo.getSingleFinalPrice(); |
|
|
|
String deposit = depositInfo.getDeposit(); |
|
|
|
map.put("money", new BigDecimal(singleFinalPrice).multiply(new BigDecimal(priceInfo.getNumber()))); |
|
|
|
map.put("moneyDx", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(new BigDecimal(singleFinalPrice).multiply(new BigDecimal(priceInfo.getNumber())).toString()).doubleValue()))); |
|
|
|
map.put("moneyXx", new BigDecimal(deposit).multiply(new BigDecimal(priceInfo.getNumber()))); |
|
|
|
map.put("moneyXx", new BigDecimal(deposit).multiply(new BigDecimal(priceInfo.getNumber())));*/ |
|
|
|
//车款：money,大写：moneyDx
|
|
|
|
String ftl = "moneyFin"; |
|
|
|
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); |
|
|
|
@ -1011,7 +1010,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
|
|
|
|
private String getCarContract(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) { |
|
|
|
String url = ""; |
|
|
|
map.put("createDate", DateUtil.today()); |
|
|
|
// map.put("createDate", DateUtil.today());
|
|
|
|
//查询销售订单的现车
|
|
|
|
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); |
|
|
|
List<CarContractListVo> carContractListVos = new ArrayList<>(); |
|
|
|
@ -1019,7 +1018,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
if (vinNoList.size() > 0) { |
|
|
|
for (int i = 0; i < vinNoList.size(); i++) { |
|
|
|
CarContractListVo carContractListVo = new CarContractListVo(); |
|
|
|
carContractListVo.setBrand(orderModelInfoVo.getBrand()); |
|
|
|
/*carContractListVo.setBrand(orderModelInfoVo.getBrand()); |
|
|
|
carContractListVo.setVinNo(vinNoList.get(i).getVinNo()); |
|
|
|
String vinSid = vinNoList.get(i).getVinSid(); |
|
|
|
if (StringUtils.isNotBlank(vinSid)) { |
|
|
|
@ -1028,7 +1027,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
if (baseVehicleSelectVo != null) { |
|
|
|
carContractListVo.setEnginNo(baseVehicleSelectVo.getEngineNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
carContractListVos.add(carContractListVo); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1591,14 +1590,22 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
//车辆交付地点
|
|
|
|
String address = priceInfo.getAddress(); |
|
|
|
//组装到文档相对应的字段中
|
|
|
|
map.put("createOrgName", createOrgName); |
|
|
|
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid()); |
|
|
|
if (invoicingDetailsVoResultBean.getData() != null) { |
|
|
|
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName()); |
|
|
|
}else{ |
|
|
|
return rb.setMsg("请先完善公司开票信息"); |
|
|
|
} |
|
|
|
// map.put("createOrgName", createOrgName);
|
|
|
|
map.put("customerName", customerName); |
|
|
|
map.put("mobile", mobile); |
|
|
|
map.put("idNo", idNo); |
|
|
|
map.put("modelName", modelName); |
|
|
|
map.put("modelConfig", modelConfig); |
|
|
|
map.put("remarks", remarks); |
|
|
|
map.put("insuranceInfo", insuranceInfo); |
|
|
|
if(appOrderDetailsVo.getInsuranceState()){ |
|
|
|
map.put("insuranceInfo", insuranceInfo); |
|
|
|
} |
|
|
|
map.put("totalPrice", totalPrice); |
|
|
|
map.put("priceRemarks", priceRemarks); |
|
|
|
map.put("depositTotal", depositTotal); |
|
|
|
|
