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

销售订单让价权限添加数量逻辑

master
dimengzhe 2 years ago
parent
df59a22883
commit
88bf0bafe1
3 changed files with 27 additions and 26 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. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java
  2. 38
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  3. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java
View File

@ -1,6 +1,7 @@
package com.yxt.anrui.base.api.commoncontract;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -11,8 +12,12 @@ import lombok.Data;
@Data
public class InvoicMessageContractVo implements Vo {
private static final long serialVersionUID = 1949545697410508233L;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("开票类型")
private String type;
@ApiModelProperty("开票金额")
private String invoicMoney;
@ApiModelProperty("开票名称")
private String invoicName;
}

38
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -759,20 +759,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return url;
}*/
private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
// File file = null;
String ftl = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
// file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles.ftl").getFile());
ftl = "existingvehicles";
} else {
//获取模板
ftl = "orderacar";
// file = new File(getClass().getClassLoader().getResource("ftl/orderacar.ftl").getFile());
}
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
// String dir = getClassLoader().getResource("ftl").getPath();
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@ -785,7 +780,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//新生成的word路径
String wordPath = targetPath + typeName;
//生成文件名
String pdfName = "合同_" + dateStr + seconds + ".pdf";
String pdfName = "新车买卖合同_" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
return pdfName;
}
@ -822,7 +817,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}*/
private String genCarSaleContractBlank(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
// File file = null;
map.put("totalPrice", "");
map.put("priceRemarks", "");
map.put("depositTotal", "");
@ -833,13 +827,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles_black";
// file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles_black.ftl").getFile());
} else {
// 订车获取模板
ftl = "orderacar_black";
// file = new File(getClass().getClassLoader().getResource("ftl/orderacar_black.ftl").getFile());
}
// String dir = getClassLoader().getResource("ftl").getPath();
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
@ -853,14 +844,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//新生成的word路径
String wordPath = targetPath + typeName;
//生成合同文件名
String pdfName = "空白合同_" + dateStr + seconds + ".pdf";
String pdfName = "新车买卖空白合同_" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
url = pdfName;
}
return url;
}
private String getReceiveCar(Map<String, Object> map,AppOrderDetailsVo appOrderDetailsVo) {
private String getReceiveCar(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
//查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
@ -897,8 +888,16 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
*/
private String getInvoicMessage(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
//根据分公司sid查询分公司开票申请
String invoicName = "";
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName());
invoicName = invoicingDetailsVoResultBean.getData().getName();
}
//查询销售订单的现车
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
List<String> stringList = orderModelInfoVo.getVinList();
List<InvoicMessageContractVo> invoicMessageContractVos = new ArrayList<>();
if (stringList.size() > 0) {
@ -906,14 +905,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
InvoicMessageContractVo vo = new InvoicMessageContractVo();
vo.setVinNo(stringList.get(i));
vo.setType(appOrderDetailsVo.getInvoiceType());
vo.setInvoicMoney(priceInfo.getSingleFinalPrice());
vo.setInvoicName(invoicName);
invoicMessageContractVos.add(vo);
}
}
//根据分公司sid查询分公司开票申请
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName());
}
map.put("invoicList", invoicMessageContractVos);
String ftl = "invoicApply";
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
@ -1648,7 +1644,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map,appOrderDetailsVo);
return getReceiveCar(map, appOrderDetailsVo);
});
Future<String> future5 = pool.submit(() -> {
return getInvoicMessage(map, appOrderDetailsVo);
@ -1666,15 +1662,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return getMoneyFin(map, appOrderDetailsVo);
});
Future<String> future8 = null;
if(!"02".equals(appOrderDetailsVo.getInvoiceType())){
if (!"02".equals(appOrderDetailsVo.getInvoiceType())) {
future8 = pool.submit(() -> {
return getCarContract(map, appOrderDetailsVo);
});
}
List<File> filesList = new ArrayList<>();
//合并pdf文件
if(future8 != null){
if(StringUtils.isNotBlank(future8.get())){
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future8.get());
filesList.add(file);
}

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

@ -1013,7 +1013,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//销售经理的角色sid
// String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
//查询销售支持部经理是否超权限
//查询销售部经理是否超权限
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid);
BaseBrandMitQuery baseBrandMitQuery = new BaseBrandMitQuery();
baseBrandMitQuery.setRoleSid(roleSid);
@ -1024,7 +1024,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String price = resultBean1.getData();
//ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
//销售支持部经理的岗位权限价格
BigDecimal bigDecimal2 = new BigDecimal(price);
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
bigDecimalTwo = bigDecimal2.add(initBigDecimal);
//判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
@ -1051,7 +1051,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额>总指导价-总成交价-优惠包总价值
//总经理的岗位权限价格
bigDecimalTwo = new BigDecimal("0");
BigDecimal bigDecimal2 = new BigDecimal(price);
BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
bigDecimalTwo = bigDecimal2.add(initBigDecimal);
//判断岗位权限+总促销价格和总指导价-总成交价-优惠包总价值的大小
if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {

Write Preview
Loading…
Cancel
Save