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

新车买卖合同、车辆买卖合同主车单台价和总价款修改

master
God 10 months ago
parent
cd7ec7bd16
commit
39a38f3737
3 changed files with 25 additions and 27 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. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
  3. 24
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

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

@ -921,7 +921,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -942,7 +942,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -955,7 +955,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("priceRemarks", priceRemarks);
}else {
//主车总价
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice",totalPrice.toString());
//车价合计大写
@ -1113,7 +1113,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1134,7 +1134,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1147,7 +1147,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("priceRemarks", priceRemarks);
}else {
//主车总价
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice",totalPrice.toString());
//车价合计大写
@ -1934,7 +1934,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1955,7 +1955,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1968,7 +1968,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("priceRemarks", priceRemarks);
}else {
//主车总价
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice",totalPrice.toString());
//车价合计大写
@ -2105,7 +2105,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -2126,7 +2126,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -2139,7 +2139,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("priceRemarks", priceRemarks);
}else {
//主车总价
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice",totalPrice.toString());
//车价合计大写

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
View File

@ -176,9 +176,9 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
return rb.setMsg("请先完善车型信息");
}
if (StringUtils.isNotBlank(vo.getTransactionPrice())) {
/*if (StringUtils.isNotBlank(vo.getTransactionPrice())) {
vo.setOverallPrice(bigDecimalFinalPrice.toString());
}
}*/
vo.setSaleOrderSid(sid);
return rb.success().setData(vo);
}

24
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -1448,9 +1448,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//消贷合同编号
map.put("loanContractNo", busSalesOrderLoancontractDetailsVo.getLoanContractNo());
//单台成交价
String transactionPrice = appBusSalesOrderPriceVo.getTransactionPrice();
String overallPrice = appBusSalesOrderPriceVo.getOverallPrice();
//车辆数量及单台成交价
String remarks = "数量：1台，单台成交价：" + transactionPrice + "元。";
String remarks = "数量：1台，单台成交价：" + overallPrice + "元。";
map.put("remarks", remarks);
//车架号
map.put("vinNo", "车架号：" + salesOrderVehicle.getLinkNo());
@ -1462,7 +1462,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1483,7 +1483,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//主车总价
BigDecimal totalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
@ -1496,7 +1496,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
map.put("priceRemarks", priceRemarks);
} else {
//主车总价
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice", totalPrice.toString());
//车价合计大写
@ -1535,9 +1535,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//车辆总数
BigDecimal num = new BigDecimal(salesOrderVehicles.size());
//单台成交价
String transactionPrice = appBusSalesOrderPriceVo.getTransactionPrice();
String overallPrice = appBusSalesOrderPriceVo.getOverallPrice();
//车辆数量及单台成交价
String remarks = "数量：" + num + "台，单台成交价：" + transactionPrice + "元。";
String remarks = "数量：" + num + "台，单台成交价：" + overallPrice + "元。";
map.put("remarks", remarks);
//车架号
String vinNo = "";
@ -1559,7 +1559,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//单台主车对应挂车总价
BigDecimal gcPrice = data.get(0).getSingleFinalPrice().multiply(new BigDecimal(data.get(0).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gcPrice);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gcPrice);
//单台主车总价
BigDecimal dtTotalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//总数合计
@ -1582,7 +1582,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//单台主车对应挂车2总价
BigDecimal gc2Price = data.get(1).getSingleFinalPrice().multiply(new BigDecimal(data.get(1).getTrailerCount()));
//单台主车加挂车总价
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).add(gc1Price).add(gc2Price);
BigDecimal zcPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).add(gc1Price).add(gc2Price);
//单台主车总价
BigDecimal dtTotalPrice = zcPrice.multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//总数合计
@ -1596,10 +1596,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
}
map.put("priceRemarks", priceRemarks);
} else {
//主车总价
BigDecimal dtTotalPrice = new BigDecimal(appBusSalesOrderPriceVo.getTransactionPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//总数合计
BigDecimal totalPrice = dtTotalPrice.multiply(num);
//主车总价合计
BigDecimal totalPrice = new BigDecimal(appBusSalesOrderPriceVo.getOverallPrice()).multiply(new BigDecimal(appBusSalesOrderPriceVo.getNumber()));
//车价合计
map.put("totalPrice", totalPrice.toString());
//车价合计大写

Write Preview
Loading…
Cancel
Save