This commit is contained in:
linfso 2025-03-16 23:04:54 +08:00
parent 0496510689
commit c50c66c552

View File

@ -164,22 +164,15 @@ public class EmisSettleSubBillServiceImpl extends EmisBaseService implements IEm
EmisSettleSubBill billItem = getSettleSubBillBySubBillNo(emisWaybillOld.getBillCode());
List<EmisSettleSubBillFeeitem> feeItemList = billItem.getFeeitemList();
List<Map<String, Object>> listMap = new ArrayList<>();
if (!CollectionUtils.isEmpty(feeItemList)) {
for (EmisSettleSubBillFeeitem feeitem : feeItemList) {
Map<String, Object> voMap = new HashMap<>();
voMap.put("feeName", feeitem.getFeeName());
voMap.put("fee", feeitem.getBillFee().stripTrailingZeros().toPlainString());
voMap.put("currency", feeitem.getCurrency());
listMap.add(voMap);
if("2004".equals(feeitem.getFeeCode())){
dutyFee=feeitem.getBillFee();
dutyFeeCurrency = feeitem.getCurrency();
}
}
}
fillMap.put("feeList", listMap);
fillMap.put("feeList", feeItemList);
fillMap.put("totalFee", billItem.getBillFee().stripTrailingZeros().toPlainString());
fillMap.put("dutyFee", dutyFee.stripTrailingZeros().toPlainString());
fillMap.put("dutyFeeCurrency", dutyFeeCurrency);