Commit 3dfa7aba authored by huyf's avatar huyf

空运提单计算总金额错误bug

(cherry picked from commit 9e1f0f99)
parent fecfe8e5
...@@ -1184,7 +1184,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin ...@@ -1184,7 +1184,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
BigDecimal totalLeft = new BigDecimal("0"); BigDecimal totalLeft = new BigDecimal("0");
BigDecimal totalRight = new BigDecimal("0"); BigDecimal totalRight = new BigDecimal("0");
StringBuffer stringBuffer = new StringBuffer(); StringBuffer stringBuffer = new StringBuffer();
List<ReceivableOrderPayedFeeTypeVO> receivableYunFeiList = payedFeeTypeVOList.stream().filter(i -> i.getFeeType() == 1).collect(Collectors.toList()); List<ReceivableOrderPayedFeeTypeVO> receivableYunFeiList = payedFeeTypeVOList.stream().filter(i -> i.getFeeType() == 1 && i.getFeeSource() == 1).collect(Collectors.toList());
for (ReceivableOrderPayedFeeTypeVO i : receivableYunFeiList) { for (ReceivableOrderPayedFeeTypeVO i : receivableYunFeiList) {
if (i.getCurrencyId() != 1L) { if (i.getCurrencyId() != 1L) {
totalLeft = totalLeft.add(changeAmountToDestCurrency(i.getCurrencyId(), 1L, i.getTotalAmount())); totalLeft = totalLeft.add(changeAmountToDestCurrency(i.getCurrencyId(), 1L, i.getTotalAmount()));
......
...@@ -43,6 +43,9 @@ public class ReceivableOrderPayedFeeTypeVO { ...@@ -43,6 +43,9 @@ public class ReceivableOrderPayedFeeTypeVO {
@ApiModelProperty(value = "收款单id") @ApiModelProperty(value = "收款单id")
private Long receiptId; private Long receiptId;
@ApiModelProperty(value = "费用来源:1 订单计算 2 费用申请 3 特需费用")
private Integer feeSource;
......
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