Merge branch 'master-billOfLading-fix' into dev

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

@@ -1201,7 +1201,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
             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) {
             if (i.getCurrencyId() != realClearanceFreightCurrency) {
                 totalRight = totalRight.add(changeAmountToDestCurrency(i.getCurrencyId(), realClearanceFreightCurrency, i.getTotalAmount()));