diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java index ba570e74..57d1c26c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java @@ -56,8 +56,10 @@ public class TmsPriceQuoteResult implements Serializable private String currency = "CNY"; /** UP / DOWN / HALF_UP */ private String roundMode; - /** 费用明细:运费/挂号费各一行,附加费按具体名称各一行 */ + /** 应收费用明细(兼容旧字段 feeDetails) */ private List feeDetails; + /** 应付费用明细 */ + private List payFeeDetails; private String quoteId; private String billId; private String orderNo; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java index fc426302..3b434c70 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java @@ -18,11 +18,13 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.price.domain.PrcIncomeBillFee; import com.ruoyi.price.domain.PrcOrderBill; +import com.ruoyi.price.domain.PrcPayBillFee; import com.ruoyi.price.domain.vo.TmsPriceBillRequest; import com.ruoyi.price.domain.vo.TmsPriceQuoteFeeLine; import com.ruoyi.price.domain.vo.TmsPriceQuoteResult; import com.ruoyi.price.mapper.PrcIncomeBillFeeMapper; import com.ruoyi.price.mapper.PrcOrderBillMapper; +import com.ruoyi.price.mapper.PrcPayBillFeeMapper; import com.ruoyi.price.search.EsBizLogSupport; import com.ruoyi.price.search.EsLogType; import com.ruoyi.price.search.IBillSearchStore; @@ -41,6 +43,9 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService @Autowired private PrcIncomeBillFeeMapper incomeBillFeeMapper; + @Autowired + private PrcPayBillFeeMapper payBillFeeMapper; + @Autowired private IBillSearchStore billSearchStore; @@ -90,7 +95,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService { throw new ServiceException(MessageUtils.message("price.bill.notFound")); } - return toResult(bill, incomeBillFeeMapper.selectByBillId(billId)); + return toResult(bill, incomeBillFeeMapper.selectByBillId(billId), + payBillFeeMapper.selectByBillId(billId)); } @Override @@ -105,7 +111,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService { throw new ServiceException(MessageUtils.message("price.bill.notFound")); } - return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId())); + return toResult(bill, incomeBillFeeMapper.selectByBillId(bill.getBillId()), + payBillFeeMapper.selectByBillId(bill.getBillId())); } private void persistBill(TmsPriceBillRequest request, BigDecimal weight, Date bizDate, @@ -218,7 +225,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService return fees; } - private TmsPriceQuoteResult toResult(PrcOrderBill bill, List fees) + private TmsPriceQuoteResult toResult(PrcOrderBill bill, List incomeFees, + List payFees) { TmsPriceQuoteResult r = new TmsPriceQuoteResult(); r.setBillId(bill.getBillId()); @@ -258,26 +266,55 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService r.setCurrency(bill.getCurrency()); r.setRoundMode(bill.getRoundMode()); r.setBizDate(bill.getBizDate()); - List lines = new ArrayList(); - if (fees != null) - { - for (PrcIncomeBillFee fee : fees) - { - TmsPriceQuoteFeeLine line = new TmsPriceQuoteFeeLine(); - line.setFeeType(fee.getFeeType()); - line.setFeeName(fee.getFeeName()); - line.setScId(fee.getScId()); - line.setAmount(fee.getAmount()); - line.setCurrency(fee.getCurrency()); - line.setRoundMode(fee.getRoundMode()); - line.setRemark(fee.getRemark()); - lines.add(line); - } - } - r.setFeeDetails(lines); + r.setFeeDetails(toIncomeFeeLines(incomeFees)); + r.setPayFeeDetails(toPayFeeLines(payFees)); return r; } + private List toIncomeFeeLines(List fees) + { + List lines = new ArrayList(); + if (fees == null) + { + return lines; + } + for (PrcIncomeBillFee fee : fees) + { + TmsPriceQuoteFeeLine line = new TmsPriceQuoteFeeLine(); + line.setFeeType(fee.getFeeType()); + line.setFeeName(fee.getFeeName()); + line.setScId(fee.getScId()); + line.setAmount(fee.getAmount()); + line.setCurrency(fee.getCurrency()); + line.setRoundMode(fee.getRoundMode()); + line.setRemark(fee.getRemark()); + lines.add(line); + } + return lines; + } + + private List toPayFeeLines(List fees) + { + List lines = new ArrayList(); + if (fees == null) + { + return lines; + } + for (PrcPayBillFee fee : fees) + { + TmsPriceQuoteFeeLine line = new TmsPriceQuoteFeeLine(); + line.setFeeType(fee.getFeeType()); + line.setFeeName(fee.getFeeName()); + line.setScId(fee.getScId()); + line.setAmount(fee.getAmount()); + line.setCurrency(fee.getCurrency()); + line.setRoundMode(fee.getRoundMode()); + line.setRemark(fee.getRemark()); + lines.add(line); + } + return lines; + } + private void fillResultOrder(TmsPriceQuoteResult r, PrcOrderBill bill) { r.setTrackingNo(bill.getTrackingNo()); diff --git a/bms-front/src/views/price/billing/components/BillDetail.vue b/bms-front/src/views/price/billing/components/BillDetail.vue index 18b21a67..37da27a5 100644 --- a/bms-front/src/views/price/billing/components/BillDetail.vue +++ b/bms-front/src/views/price/billing/components/BillDetail.vue @@ -77,33 +77,66 @@ -
+
费用明细
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -111,7 +144,7 @@