提交 f3dd0eff authored 作者: huyufan's avatar huyufan

处理BUG

上级 661790c0
...@@ -99,14 +99,14 @@ public class OrderChildLoanComponent { ...@@ -99,14 +99,14 @@ public class OrderChildLoanComponent {
if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) { if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
log.info("3.进行标吨判断"); log.info("3.进行标吨判断");
determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight); determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight, quotationDetailVO.getPlatformFreightQuotation());
} else { } else {
log.info("3.进行超吨判断"); log.info("3.进行超吨判断");
determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight); determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight, quotationDetailVO.getPlatformFreightQuotation());
} }
} }
public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight) { public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight, BigDecimal platPrice) {
log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderGoods.getOrderNo(), childNo); log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderGoods.getOrderNo(), childNo);
List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderGoods.getOrderNo()); List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderGoods.getOrderNo());
BigDecimal frozen = runningWaterRecordList.stream().filter(item -> { BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
...@@ -131,9 +131,9 @@ public class OrderChildLoanComponent { ...@@ -131,9 +131,9 @@ public class OrderChildLoanComponent {
size = orderChildList.size(); size = orderChildList.size();
} }
if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) { if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(size)); orderChildSum = platPrice.multiply(new BigDecimal(35)).multiply(new BigDecimal(size));
} else { } else {
orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size)); orderChildSum = platPrice.multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
} }
log.info("5.1 查询未结算运单, 运单数量{},订单号{}", size, orderGoods.getOrderNo()); log.info("5.1 查询未结算运单, 运单数量{},订单号{}", size, orderGoods.getOrderNo());
BigDecimal ans = subtract.subtract(orderChildSum); BigDecimal ans = subtract.subtract(orderChildSum);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论