|
|
@@ -3151,7 +3151,7 @@ public class KwtLogisticsConsignmentService {
|
|
|
goodsInfoVO.setGoodsName(kwpGoods.getName() + "/" + goodsTypeMap.getOrDefault(kwpGoods.getGoodsType(), "") + "/" + goodsSpecMap.getOrDefault(kwpGoods.getSpec(), ""));
|
|
|
priceUnit = kwpGoods.getPriceUnit();
|
|
|
}
|
|
|
- goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice()) ? logisticsOrder.getPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + logisticsOrder.getUnit());
|
|
|
+ goodsInfoVO.setUnitPrice((Objects.nonNull(logisticsOrder.getPrice()) ? logisticsOrder.getPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + "元");
|
|
|
goodsInfoVO.setOrderAmount((Objects.nonNull(orderDetailVo.getAmount()) ? orderDetailVo.getAmount().setScale(2, RoundingMode.HALF_UP).toPlainString() : "0.00") + logisticsOrder.getUnit());
|
|
|
BigDecimal carriageCost = Objects.nonNull(orderDetailVo.getAmount()) && Objects.nonNull(logisticsOrder.getPrice()) ?
|
|
|
orderDetailVo.getAmount().multiply(logisticsOrder.getPrice()) : BigDecimal.ZERO;
|