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

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -1178,7 +1178,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
         BigDecimal totalLeft = new BigDecimal("0");
         BigDecimal totalRight = new BigDecimal("0");
         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) {
             if (i.getCurrencyId() != 1L) {
                 totalLeft = totalLeft.add(changeAmountToDestCurrency(i.getCurrencyId(), 1L, i.getTotalAmount()));

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receivable/ReceivableOrderPayedFeeTypeVO.java

@@ -43,6 +43,9 @@ public class ReceivableOrderPayedFeeTypeVO {
     @ApiModelProperty(value = "收款单id")
     private Long receiptId;
 
+    @ApiModelProperty(value = "费用来源：1 订单计算 2 费用申请 3 特需费用")
+    private Integer feeSource;
+