Commit 309f888f authored by 332784038@qq.com's avatar 332784038@qq.com

提单金额bug补充修复

parent fca44856
...@@ -1193,7 +1193,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin ...@@ -1193,7 +1193,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
realClearanceFreightCurrency = 6L; realClearanceFreightCurrency = 6L;
} }
//总金额右边再加上清关费 //总金额右边再加上清关费
List<ReceivableOrderPayedFeeTypeVO> receivableQingGuanFeiList = payedFeeTypeVOList.stream().filter(i -> i.getFeeType() == 2).collect(Collectors.toList()); List<ReceivableOrderPayedFeeTypeVO> receivableQingGuanFeiList = payedFeeTypeVOList.stream().filter(i -> i.getFeeType() == 2 && i.getFeeSource() == 1).collect(Collectors.toList());
for (ReceivableOrderPayedFeeTypeVO i : receivableQingGuanFeiList) { for (ReceivableOrderPayedFeeTypeVO i : receivableQingGuanFeiList) {
if (i.getCurrencyId() != realClearanceFreightCurrency) { if (i.getCurrencyId() != realClearanceFreightCurrency) {
totalRight = totalRight.add(changeAmountToDestCurrency(i.getCurrencyId(), realClearanceFreightCurrency, i.getTotalAmount())); totalRight = totalRight.add(changeAmountToDestCurrency(i.getCurrencyId(), realClearanceFreightCurrency, i.getTotalAmount()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment