Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
commit
011fdf9910
  1. 257
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java
  3. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

257
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -773,7 +773,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台,单台成交价:" + transactionPrice + "元。车架号:" + String.join("、", stringList); remarks = "主车" + num + "台,单台成交价:" + transactionPrice + "元。车架号:" + String.join("、", stringList);
} else { } else {
@ -816,7 +816,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles"; ftl = "existingvehicles";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台,单台成交价:" + transactionPrice + "元。车架号:" + String.join("、", stringList); remarks = "主车" + num + "台,单台成交价:" + transactionPrice + "元。车架号:" + String.join("、", stringList);
} else { } else {
@ -894,7 +894,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles_black"; ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台,单台成交价: 元。车架号:" + String.join("、", stringList); remarks = "主车" + num + "台,单台成交价: 元。车架号:" + String.join("、", stringList);
} else { } else {
@ -943,7 +943,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板 //获取模板
ftl = "existingvehicles_black"; ftl = "existingvehicles_black";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) { if (stringList.size() > 0) {
remarks = "主车" + num + "台,单台成交价: 元。车架号:" + String.join("、", stringList); remarks = "主车" + num + "台,单台成交价: 元。车架号:" + String.join("、", stringList);
} else { } else {
@ -1022,7 +1022,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//查询销售订单的现车 //查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo(); AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo(); AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
List<String> stringList = orderModelInfoVo.getVinList(); List<String> stringList = orderModelInfoVo.getOrderVinList();
List<InvoicMessageContractVo> invoicMessageContractVos = new ArrayList<>(); List<InvoicMessageContractVo> invoicMessageContractVos = new ArrayList<>();
if (stringList.size() > 0) { if (stringList.size() > 0) {
for (int i = 0; i < stringList.size(); i++) { for (int i = 0; i < stringList.size(); i++) {
@ -1775,115 +1775,119 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid()); String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
map.put("contractNo", contractNo); map.put("contractNo", contractNo);
String url = ""; String url = "";
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
try { try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build(); .setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100, ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS, 0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
/* Future<String> future1 = pool.submit(() -> { if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
return genCarSaleContract(dto, map, appOrderDetailsVo); /* Future<String> future1 = pool.submit(() -> {
}); return genCarSaleContract(dto, map, appOrderDetailsVo);
Future<String> future1_2 = pool.submit(() -> {
return genCarSaleContract2(dto, map, appOrderDetailsVo);
});*/
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
/* Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
Future<String> future2_2 = pool.submit(() -> {
return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
});
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
});
Future<String> future5 = pool.submit(() -> {
return getInvoicMessage(map, appOrderDetailsVo);
});
String singleFinalPriceOne = priceInfo.getSingleFinalPrice();
String depositOne = depositInfo.getDeposit();
//单台成交价与单台订金相等
Future<String> future6 = null;
if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) {
future6 = pool.submit(() -> {
return getCarFin(map, appOrderDetailsVo);
}); });
} Future<String> future1_2 = pool.submit(() -> {
Future<String> future7 = pool.submit(() -> { return genCarSaleContract2(dto, map, appOrderDetailsVo);
return getMoneyFin(map, appOrderDetailsVo);
});
Future<String> future8 = null;
if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(map, appOrderDetailsVo);
}); });
} Future<String> future2 = pool.submit(() -> {
List<File> filesList = new ArrayList<>(); return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
if (future1 != null) { });
if (StringUtils.isNotBlank(future1.get())) { Future<String> future2_2 = pool.submit(() -> {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get()); return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
filesList.add(file); });
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
});
Future<String> future5 = pool.submit(() -> {
return getInvoicMessage(map, appOrderDetailsVo);
});
String singleFinalPriceOne = priceInfo.getSingleFinalPrice();
String depositOne = depositInfo.getDeposit();
//单台成交价与单台订金相等
Future<String> future6 = null;
if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) {
future6 = pool.submit(() -> {
return getCarFin(map, appOrderDetailsVo);
});
} }
} Future<String> future7 = pool.submit(() -> {
if (future1_2 != null) { return getMoneyFin(map, appOrderDetailsVo);
if (StringUtils.isNotBlank(future1_2.get())) { });
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get()); Future<String> future8 = null;
filesList.add(file); if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(map, appOrderDetailsVo);
});
} }
} List<File> filesList = new ArrayList<>();
if (future2 != null) { if (future1 != null) {
if (StringUtils.isNotBlank(future2.get())) { if (StringUtils.isNotBlank(future1.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get()); File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
filesList.add(file); filesList.add(file);
}
} }
} if (future1_2 != null) {
if (future2_2 != null) { if (StringUtils.isNotBlank(future1_2.get())) {
if (StringUtils.isNotBlank(future2_2.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get());
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get()); filesList.add(file);
filesList.add(file); }
} }
} if (future2 != null) {
//合并pdf文件 if (StringUtils.isNotBlank(future2.get())) {
if (future8 != null) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
if (StringUtils.isNotBlank(future8.get())) { filesList.add(file);
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get()); }
}
if (future2_2 != null) {
if (StringUtils.isNotBlank(future2_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get());
filesList.add(file);
}
}
//合并pdf文件
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
filesList.add(file);
}
}
if (StringUtils.isNotBlank(future4.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file); filesList.add(file);
} }
} if (StringUtils.isNotBlank(future5.get())) {
if (StringUtils.isNotBlank(future4.get())) { File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
File file = new File(docPdfComponent.getUploadTemplateUrl() + future4.get());
filesList.add(file);
}
if (StringUtils.isNotBlank(future5.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
filesList.add(file);
}
if (future6 != null) {
if (StringUtils.isNotBlank(future6.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
filesList.add(file); filesList.add(file);
} }
} if (future6 != null) {
if (StringUtils.isNotBlank(future6.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
filesList.add(file);
}
}
if (StringUtils.isNotBlank(future7.get())) { if (StringUtils.isNotBlank(future7.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future7.get()); File file = new File(docPdfComponent.getUploadTemplateUrl() + future7.get());
filesList.add(file); filesList.add(file);
} }
if (filesList.size() > 0) { if (filesList.size() > 0) {
String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf"; // String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf";
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); String typeName = appOrderDetailsVo.getPayType()+contractNo+".pdf";
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName); File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName; System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
urlAll = typeName;
}
if (StringUtils.isNotBlank(urlAll)) {
printConfirmVo = new PrintConfirmVo();
// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CONTRACTALL.getName()));
printConfirmVo.setName(MessageFormat.format("《{0}》",appOrderDetailsVo.getPayType()+contractNo));
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll);
list.add(printConfirmVo);
}*/
} }
if (StringUtils.isNotBlank(urlAll)) {
printConfirmVo = new PrintConfirmVo();
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CONTRACTALL.getName()));
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + urlAll);
list.add(printConfirmVo);
}*/
//生成合同数据 //生成合同数据
//根据销售订单sid查询合同表中是否存在 //根据销售订单sid查询合同表中是否存在
CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid()); CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
@ -1973,7 +1977,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台成交价与单台订金相等 //单台成交价与单台订金相等
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
// if ("现车".equals(appOrderDetailsVo.getOrderType())) {
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
for (int i = 0; i < vinList.size(); i++) { for (int i = 0; i < vinList.size(); i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto(); UnCollectionDto unCollectionDto = new UnCollectionDto();
@ -2005,34 +2008,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
} }
/* } else {
int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
for (int i = 0; i < qualiy; i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
//合同sid
unCollectionDto.setContractSid(commonContract.getSid());
//合同编号
unCollectionDto.setContractNo(commonContract.getContractNo());
//客户名称
unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
//客户sid
unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
unCollectionDto.setReceivablesName("车款");
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setCurrentReceivableMoney(money);
unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(money);
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}*/
} }
//添加推送至款项确认的应收未收明细中 //添加推送至款项确认的应收未收明细中
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
@ -2079,7 +2054,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone()); unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid()); unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setVinNo(vinList.get(i).getVinNo()); unCollectionDto.setVinNo(vinList.get(i).getVinNo());
// unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString()); unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString());
unCollectionDto.setUserSid(dto.getUserSid()); unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(depositInfo.getDeposit()); unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
@ -2091,39 +2065,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
} }
} }
/*} else {
int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
for (int i = 0; i < qualiy; i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
//合同sid
unCollectionDto.setContractSid(commonContract.getSid());
//合同编号
unCollectionDto.setContractNo(commonContract.getContractNo());
//客户名称
unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
//客户sid
unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
unCollectionDto.setReceivablesName("订金");
unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
unCollectionDto.setUserSid(dto.getUserSid());
unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}*/
return commonContract.getSid(); return commonContract.getSid();
}); });
} }
if("2".equals(appOrderDetailsVo.getPayTypeKey())){
return rb.setMsg("贷款合同附件请线下处理");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return rb.setMsg("生成文件失败"); return rb.setMsg("生成文件失败");

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java

@ -31,8 +31,10 @@ public class AppOrderModelInfoVo implements Vo {
private String type; private String type;
@ApiModelProperty(value = "车架号") @ApiModelProperty(value = "车架号")
private List<String> vinList = new ArrayList<>(); private List<String> vinList = new ArrayList<>();
private List<String> orderVinList = new ArrayList<>();
@ApiModelProperty(value = "采购订单编号") @ApiModelProperty(value = "采购订单编号")
private List<String> orderList = new ArrayList<>(); private List<String> orderList = new ArrayList<>();
private List<String> orderStringList = new ArrayList<>();
@ApiModelProperty(value = "合计数量") @ApiModelProperty(value = "合计数量")
private String total; private String total;

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

@ -2878,15 +2878,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询车架号 //查询车架号
// List<String> vinList = busSalesOrderVehicleService.selectList(sid); // List<String> vinList = busSalesOrderVehicleService.selectList(sid);
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid); List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList()); List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList());
List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
modelInfo.setVinList(vinList); modelInfo.setVinList(vinList);
modelInfo.setOrderVinList(orderVinList);
} else { } else {
if ("1".equals(modelInfo.getType())) { if ("1".equals(modelInfo.getType())) {
//查询采购订单编号 //查询采购订单编号
// List<String> stringList = busSalesVehicleOrderService.selectList(sid); // List<String> stringList = busSalesVehicleOrderService.selectList(sid);
List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid); List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
//包含采购系统的采购订单编号
List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList()); List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList());
List<String> orderStringList = busSalesVehicleOrderService.selectList(sid);
modelInfo.setOrderList(stringList); modelInfo.setOrderList(stringList);
modelInfo.setOrderStringList(orderStringList);
} }
} }
List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid); List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid);

Loading…
Cancel
Save