提交 f6a8fae9 authored 作者: aiqingguo's avatar aiqingguo

运单查询用户判断

上级 0c324ca0
...@@ -59,6 +59,7 @@ public enum PerformanceResultEnum implements ResultEnum { ...@@ -59,6 +59,7 @@ public enum PerformanceResultEnum implements ResultEnum {
ORDER_CHILD_UNLOAD_TIME_ERROR(1317, "非卸车时间段"), ORDER_CHILD_UNLOAD_TIME_ERROR(1317, "非卸车时间段"),
ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR(1318, "没有到达货源地"), ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR(1318, "没有到达货源地"),
ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_DISTANCE_ERROR(1319, "没有到达目的地"), ORDER_CHILD_ARRIVE_RECEIVE_ADDRESS_DISTANCE_ERROR(1319, "没有到达目的地"),
ORDER_CHILD_OPERATION_FORBID(1320, "没有权限操作"),
; ;
private final int code; private final int code;
......
...@@ -47,14 +47,12 @@ public class OrderChildFreightInfoVO { ...@@ -47,14 +47,12 @@ public class OrderChildFreightInfoVO {
private BigDecimal lossPrice; private BigDecimal lossPrice;
@ApiModelProperty(value = "总运费(元)", example = "1.23") @ApiModelProperty(value = "总运费(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal totalFreight; private BigDecimal totalFreight;
public BigDecimal getTotalFreight() { public BigDecimal getTotalFreight() {
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP); return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
} }
@ApiModelProperty(value = "亏吨扣款(元)", example = "1.23") @ApiModelProperty(value = "亏吨扣款(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal lossFreight; private BigDecimal lossFreight;
public BigDecimal getLossFreight() { public BigDecimal getLossFreight() {
return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : lossPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP); return (loadNet==null || unloadNet==null || unloadNet.compareTo(loadNet)>0)? BigDecimal.ZERO : lossPrice.multiply(loadNet.subtract(unloadNet)).setScale(2, RoundingMode.HALF_UP);
......
...@@ -150,10 +150,9 @@ public class OrderChildVO { ...@@ -150,10 +150,9 @@ public class OrderChildVO {
private Address receiveAddressInfo; private Address receiveAddressInfo;
@ApiModelProperty(value = "总运费(元)", example = "1.23") @ApiModelProperty(value = "总运费(元)", example = "1.23")
@MoneyOutConvert
private BigDecimal totalFreight; private BigDecimal totalFreight;
public BigDecimal getTotalFreight() { public BigDecimal getTotalFreight() {
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP); return freightPrice.multiply(weight).setScale(2, RoundingMode.HALF_UP);
} }
} }
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论