|
|
@@ -4578,6 +4578,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
String shipmentTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.SHIPMENT.getCode();
|
|
|
KwtWaybillOrderTicket tareAmountTicket = ticketMap.getOrDefault(shipmentTicketKey, new KwtWaybillOrderTicket());
|
|
|
resp.setTareAmount(tareAmountTicket.getTareAmount());
|
|
|
+ resp.setGrossAmount(tareAmountTicket.getGrossAmount());
|
|
|
}else if (org.apache.commons.lang3.StringUtils.equals(logOrder.getBillingMode(), DictEnum.CHARGING_TYPE_2.getValue())){
|
|
|
BigDecimal actualPrice = Objects.nonNull(logOrder.getPrice()) && Objects.nonNull(subtask.getUnloadAmount()) ?
|
|
|
logOrder.getPrice().multiply(subtask.getUnloadAmount()) : BigDecimal.ZERO;
|
|
|
@@ -4588,6 +4589,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
|
|
|
String takeTicketKey = subtask.getWOrderId() + "-" + AddressTypeEnum.TAKE.getCode();
|
|
|
KwtWaybillOrderTicket grossAmountTicket = ticketMap.getOrDefault(takeTicketKey, new KwtWaybillOrderTicket());
|
|
|
+ resp.setTareAmount(grossAmountTicket.getTareAmount());
|
|
|
resp.setGrossAmount(grossAmountTicket.getGrossAmount());
|
|
|
|
|
|
}
|