提交 5e557239 authored 作者: liruixin's avatar liruixin

代码优化

上级 5da90f7a
...@@ -35,12 +35,15 @@ public class CarrierOrderChildDetailVO { ...@@ -35,12 +35,15 @@ public class CarrierOrderChildDetailVO {
private BigDecimal freightPrice; private BigDecimal freightPrice;
@ApiModelProperty(value = "应付运费(元)", example = "1.23") @ApiModelProperty(value = "应付运费(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal payableFreight; private BigDecimal payableFreight;
@ApiModelProperty(value = "亏吨扣款(元)", example = "1.23") @ApiModelProperty(value = "亏吨扣款(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal lossDeduction; private BigDecimal lossDeduction;
@ApiModelProperty(value = "实付运费(元)", example = "1.23") @ApiModelProperty(value = "实付运费(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal realFreight; private BigDecimal realFreight;
......
...@@ -1127,17 +1127,17 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -1127,17 +1127,17 @@ public class OrderChildServiceImpl implements OrderChildService {
BigDecimal payableFreight=BigDecimal.ZERO; BigDecimal payableFreight=BigDecimal.ZERO;
if(Objects.nonNull(orderChild.getLoadNet())){ if(Objects.nonNull(orderChild.getLoadNet())){
payableFreight = orderChild.getLoadNet() payableFreight = orderChild.getLoadNet()
.multiply(orderChild.getFreightPrice().movePointLeft(2)) .multiply(orderChild.getFreightPrice())
.setScale(2,BigDecimal.ROUND_HALF_UP); .setScale(0,BigDecimal.ROUND_HALF_UP);
} }
//亏吨扣款(元) //亏吨扣款(元)
BigDecimal lossDeduction=BigDecimal.ZERO; BigDecimal lossDeduction=BigDecimal.ZERO;
if(Objects.nonNull(orderChild.getLoadNet()) && Objects.nonNull(orderChild.getUnloadNet())){ if(Objects.nonNull(orderChild.getLoadNet()) && Objects.nonNull(orderChild.getUnloadNet())){
if(orderChild.getLoadNet().compareTo(orderChild.getUnloadNet()) >0){ if(orderChild.getLoadNet().compareTo(orderChild.getUnloadNet()) >0){
lossDeduction = carrierOrderChildDetailVO.getLossPrice().movePointLeft(2) lossDeduction = carrierOrderChildDetailVO.getLossPrice()
.multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet())) .multiply(orderChild.getLoadNet().subtract(orderChild.getUnloadNet()))
.setScale(2,BigDecimal.ROUND_HALF_UP); .setScale(0,BigDecimal.ROUND_HALF_UP);
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论