diff --git a/bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirAllocOrder.java b/bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirAllocOrder.java index ef789233..ca0fa5b5 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirAllocOrder.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/airbill/domain/SrvBillAirAllocOrder.java @@ -12,7 +12,7 @@ public class SrvBillAirAllocOrder private String orderNo; /** 计费订单 ID,对应 prc_order_bill.bill_id */ - private String billId; + private Long billId; /** 计费重,没有计费重时依次取实际重量、收货重量 */ private BigDecimal chargeWeight; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillLine.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillLine.java index 70275661..870aca30 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillLine.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillLine.java @@ -15,7 +15,8 @@ public class PayBillLine private String feeId; - private String orderBillId; + /** 计费订单ID,对应 prc_order_bill.bill_id */ + private Long orderBillId; private String orderNo; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillOrder.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillOrder.java index a03d392e..4738edc9 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillOrder.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PayBillOrder.java @@ -9,7 +9,8 @@ import lombok.Data; @Data public class PayBillOrder { - private String billId; + /** 计费订单ID,对应 prc_order_bill.bill_id */ + private Long billId; private String orderNo; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java index 1140f401..d8f14a1c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBill.java @@ -14,8 +14,8 @@ public class PrcPayBill implements Serializable /** 应付主表ID */ private String payBillId; - /** 计费订单ID */ - private String billId; + /** 计费订单ID,对应 prc_order_bill.bill_id */ + private Long billId; /** 币种 */ private String currency; /** 产品价合计 */ diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java index 35011024..38e28144 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcPayBillFee.java @@ -13,7 +13,8 @@ public class PrcPayBillFee implements Serializable private static final long serialVersionUID = 1L; private String feeId; - private String billId; + /** 计费订单ID,对应 prc_order_bill.bill_id */ + private Long billId; /** 应付主表ID */ private String payBillId; private String feeType; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayBillMapper.java index ec93452b..24d38ae5 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayBillMapper.java @@ -65,7 +65,7 @@ public interface PayBillMapper * @param billIds 计费订单ID * @return 订单应付费用 */ - List selectOrderFees(@Param("billIds") List billIds); + List selectOrderFees(@Param("billIds") List billIds); /** * 读取还没被未作废账单占用的费用。旧账单没有费用行号时,整票视为已占用。 @@ -73,7 +73,7 @@ public interface PayBillMapper * @param billIds 计费订单ID * @return 可抄进本次账单的费用 */ - List selectFreeFees(@Param("billIds") List billIds); + List selectFreeFees(@Param("billIds") List billIds); /** * 这票订单还有没有未删除的计算费用。 @@ -81,7 +81,7 @@ public interface PayBillMapper * @param billId 计费订单ID * @return 计算费用条数 */ - int countCalcFees(@Param("billId") String billId); + int countCalcFees(@Param("billId") Long billId); /** * 插入一张草稿应付账单。 diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayFinanceMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayFinanceMapper.java index 535c8add..9dd34cad 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayFinanceMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PayFinanceMapper.java @@ -24,5 +24,5 @@ public interface PayFinanceMapper int stampFee(@Param("feeId") String feeId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName); - int stampCalc(@Param("billId") String billId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName); + int stampCalc(@Param("billId") Long billId, @Param("supplierId") Long supplierId, @Param("supplierName") String supplierName); } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java index 9c540059..a9802717 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillFeeMapper.java @@ -13,7 +13,7 @@ public interface PrcPayBillFeeMapper * @param billId 计费订单ID * @return 费用明细 */ - public List selectByBillId(String billId); + public List selectByBillId(Long billId); /** * 插入一条订单应付费用。 @@ -40,7 +40,7 @@ public interface PrcPayBillFeeMapper * @param billId 计费订单ID * @return 影响行数 */ - public int deleteByBillId(String billId); + public int deleteByBillId(Long billId); /** * 逻辑删除某一条提单费用分摊到订单上的明细。 @@ -51,10 +51,10 @@ public interface PrcPayBillFeeMapper public int markLadingFeeDeleted(@Param("feeId") Long feeId); /** 这条提单费用已经分摊到的订单。作废前取出,用来重算应付总额。 */ - public List selectBillIdsByLadingFee(@Param("feeId") Long feeId); + public List selectBillIdsByLadingFee(@Param("feeId") Long feeId); /** 明细还没挂上应付主表时,按订单补上主表 ID。单次不超过 1000 个订单。 */ - public int bindPayBillId(@Param("billIds") List billIds); + public int bindPayBillId(@Param("billIds") List billIds); /** * 这条提单费用分摊到的订单里,取一个已经生成应付账单的订单号。 diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java index 1b1b880a..54b7c749 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcPayBillMapper.java @@ -13,7 +13,7 @@ public interface PrcPayBillMapper * @param billId 计费订单ID * @return 订单应付,没有时为 null */ - PrcPayBill selectByBillId(String billId); + PrcPayBill selectByBillId(Long billId); /** * 按应付主表ID读取。 @@ -53,7 +53,7 @@ public interface PrcPayBillMapper * @param billId 计费订单ID * @return 影响行数 */ - int deleteByBillId(String billId); + int deleteByBillId(Long billId); /** * 按未删除的应付明细合计,回写这些订单的应付总额。 @@ -61,8 +61,8 @@ public interface PrcPayBillMapper * @param billIds 计费订单 ID,单次不超过 1000 个 * @return 影响行数 */ - int refreshPayTotal(@Param("billIds") List billIds); + int refreshPayTotal(@Param("billIds") List billIds); /** 订单还没有应付主表时补一行,总额随后按明细重算。单次不超过 1000 个订单。 */ - int insertMissingPayBills(@Param("billIds") List billIds, @Param("operator") String operator); + int insertMissingPayBills(@Param("billIds") List billIds, @Param("operator") String operator); } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirAllocMapper.java b/bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirAllocMapper.java index fb9d5186..9d0698a4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirAllocMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/mapper/SrvBillAirAllocMapper.java @@ -34,7 +34,7 @@ public interface SrvBillAirAllocMapper * @param billIds 计费订单 ID * @return 应付主表编号 */ - List selectPayBills(@Param("billIds") List billIds); + List selectPayBills(@Param("billIds") List billIds); /** * 把仍是未分摊的费用改为已分摊。已经不是未分摊的行不会被改到。 diff --git a/bms-back/bms-system/src/main/java/com/bms/price/pay/PaySettleSupport.java b/bms-back/bms-system/src/main/java/com/bms/price/pay/PaySettleSupport.java index cb68728e..31c0dfee 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/pay/PaySettleSupport.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/pay/PaySettleSupport.java @@ -24,10 +24,10 @@ public class PaySettleSupport * @param billId 计费订单ID * @param cardName 价卡归属名称 */ - public void stampCalc(String billId, String cardName) + public void stampCalc(Long billId, String cardName) { BmsSupplier supplier = match(cardName); - if (supplier == null || billId == null || billId.isBlank()) + if (supplier == null || billId == null) { return; } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPayBillFeeService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPayBillFeeService.java index e4c250cf..b3a1a722 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPayBillFeeService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcPayBillFeeService.java @@ -21,5 +21,5 @@ public interface IPrcPayBillFeeService * * @param billIds 计费订单 ID */ - void refreshTotals(List billIds); + void refreshTotals(List billIds); } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayBillServiceImpl.java index 4286205b..e062ee85 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayBillServiceImpl.java @@ -152,9 +152,9 @@ public class PayBillServiceImpl implements IPayBillService throw new ServiceException(preview.getMissingNos().isEmpty() ? PaymentMesEnum.BMS_PAY_NO_GEN.getCnMes() : "订单号没有对上:" + String.join("、", preview.getMissingNos())); } String currency = currencyOf(orders); - Map versions = new HashMap<>(); + Map versions = new HashMap<>(); List skipped = new ArrayList<>(); - List billIds = new ArrayList<>(); + List billIds = new ArrayList<>(); for (PayBillOrder order : orders) { billIds.add(order.getBillId()); @@ -164,8 +164,7 @@ public class PayBillServiceImpl implements IPayBillService } try { - PayOrderCostResult cost = payOrderCostService.generateIsolated( - order.getBillId() == null ? null : Long.valueOf(order.getBillId())); + PayOrderCostResult cost = payOrderCostService.generateIsolated(order.getBillId()); if (cost != null) { versions.put(order.getBillId(), cost.getVersionNo()); @@ -229,7 +228,7 @@ public class PayBillServiceImpl implements IPayBillService bill.setSourceType(mode(command)); bill.setPeriodStart(parseDay(command.getBeginDate())); bill.setPeriodEnd(parseDay(command.getEndDate())); - Set orderIds = new HashSet<>(); + Set orderIds = new HashSet<>(); for (PayBillLine line : lines) { if (line.getOrderBillId() != null) @@ -948,11 +947,11 @@ public class PayBillServiceImpl implements IPayBillService * @param billId 计费订单ID * @return 订单;对不上时返回 null */ - private PayBillOrder findOrder(List orders, String billId) + private PayBillOrder findOrder(List orders, Long billId) { for (PayBillOrder order : orders) { - if (order.getBillId().equals(billId)) + if (order.getBillId() != null && order.getBillId().equals(billId)) { return order; } @@ -1112,11 +1111,12 @@ public class PayBillServiceImpl implements IPayBillService { List kept = new ArrayList<>(); Set notes = new LinkedHashSet<>(); - Map cards = new HashMap<>(); + Map cards = new HashMap<>(); for (PrcPayBillFee fee : fees) { PayBillOrder order = findOrder(orders, fee.getBillId()); - String orderNo = order == null || order.getOrderNo() == null ? fee.getBillId() : order.getOrderNo(); + String orderNo = order == null || order.getOrderNo() == null + ? (fee.getBillId() == null ? "" : String.valueOf(fee.getBillId())) : order.getOrderNo(); String why = partyReason(fee, order, supplier, cards); if (why == null) { @@ -1132,7 +1132,7 @@ public class PayBillServiceImpl implements IPayBillService return kept; } - private String partyReason(PrcPayBillFee fee, PayBillOrder order, BmsSupplier supplier, Map cards) + private String partyReason(PrcPayBillFee fee, PayBillOrder order, BmsSupplier supplier, Map cards) { if (fee.getSettleSupplierId() != null) { @@ -1154,7 +1154,7 @@ public class PayBillServiceImpl implements IPayBillService return "人工费用没有付款对象,未并入"; } String card = cards.computeIfAbsent(fee.getBillId(), - id -> payOrderCostService.cardSupplierName(id == null ? null : Long.valueOf(id))); + id -> payOrderCostService.cardSupplierName(id)); if (card == null || card.isBlank()) { return "价卡没有归属供应商,未并入"; @@ -1269,7 +1269,7 @@ public class PayBillServiceImpl implements IPayBillService List lines = payBillMapper.selectLines(billId); BigDecimal total = BigDecimal.ZERO; BigDecimal supplier = BigDecimal.ZERO; - Set orders = new HashSet<>(); + Set orders = new HashSet<>(); for (PayBillLine line : lines) { BigDecimal amount = line.getAmount() == null ? BigDecimal.ZERO : line.getAmount(); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java index 7ceb9417..1d59652a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PayOrderCostServiceImpl.java @@ -132,12 +132,12 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService } String operator = SecurityUtils.getUsername(); PrcPayBill payBill = saveBill(bill, result, operator); - saveFees(String.valueOf(bill.getBillId()), payBill.getPayBillId(), result.getFees()); + saveFees(bill.getBillId(), payBill.getPayBillId(), result.getFees()); String channelName = channel.getChannelName() == null ? channel.getChannelCode() : channel.getChannelName(); String end = product.getTermEnd() == null ? "不限" : day(product.getTermEnd()); result.setMessage("渠道「" + channelName + "」" + product.getProductName() + " 第 " + product.getVersionNo() + " 版(" + day(product.getTermStart()) + " 至 " + end + ")," + result.getMessage()); - paySettleSupport.stampCalc(String.valueOf(bill.getBillId()), product.getSupplierName()); + paySettleSupport.stampCalc(bill.getBillId(), product.getSupplierName()); return result; } @@ -551,12 +551,12 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService */ private PrcPayBill saveBill(PrcOrderBill bill, PayOrderCostResult result, String operator) { - PrcPayBill existed = payBillMapper.selectByBillId(String.valueOf(bill.getBillId())); + PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId()); PrcPayBill row = existed == null ? new PrcPayBill() : existed; if (existed == null) { row.setPayBillId(UUID.randomUUID().toString()); - row.setBillId(String.valueOf(bill.getBillId())); + row.setBillId(bill.getBillId()); row.setCreateBy(operator); } row.setCurrency(result.getCurrency()); @@ -585,7 +585,7 @@ public class PayOrderCostServiceImpl implements IPayOrderCostService * @param payBillId 订单应付主表ID * @param fees 本次算出的费用 */ - private void saveFees(String billId, String payBillId, List fees) + private void saveFees(Long billId, String payBillId, List fees) { payBillFeeMapper.deleteByBillId(billId); List rows = new java.util.ArrayList<>(); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index 50e770ec..15b283ac 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -2543,7 +2543,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService } - private List toPayFeeRows(String billId, String payBillId, TmsPriceQuoteResult result) + private List toPayFeeRows(Long billId, String payBillId, TmsPriceQuoteResult result) { List fees = new ArrayList(); if (result.getPayFeeDetails() == null) @@ -2575,12 +2575,12 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService { return null; } - PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId())); + PrcPayBill existed = payBillMapper.selectByBillId(bill.getBillId()); PrcPayBill row = existed == null ? new PrcPayBill() : existed; if (existed == null) { row.setPayBillId(UUID.randomUUID().toString()); - row.setBillId(bill.getBillId() == null ? null : String.valueOf(bill.getBillId())); + row.setBillId(bill.getBillId()); row.setCreateBy(bill.getCreateBy()); } row.setCurrency(StringUtils.isEmpty(bill.getCurrency()) ? "CNY" : bill.getCurrency()); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPayBillFeeServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPayBillFeeServiceImpl.java index 6224f2b1..d5a0d215 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPayBillFeeServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcPayBillFeeServiceImpl.java @@ -38,7 +38,7 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService { return; } - LinkedHashSet billIds = new LinkedHashSet<>(); + LinkedHashSet billIds = new LinkedHashSet<>(); for (int from = 0; from < fees.size(); from += BATCH_SIZE) { List chunk = fees.subList(from, Math.min(from + BATCH_SIZE, fees.size())); @@ -58,9 +58,9 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService } for (PrcPayBillFee fee : chunk) { - if (fee != null && fee.getBillId() != null && !fee.getBillId().isBlank()) + if (fee != null && fee.getBillId() != null) { - billIds.add(fee.getBillId().trim()); + billIds.add(fee.getBillId()); } } } @@ -68,47 +68,29 @@ public class PrcPayBillFeeServiceImpl implements IPrcPayBillFeeService } @Override - public void refreshTotals(List billIds) + public void refreshTotals(List billIds) { if (billIds == null || billIds.isEmpty()) { return; } - LinkedHashSet unique = new LinkedHashSet<>(); - for (String billId : billIds) + LinkedHashSet unique = new LinkedHashSet<>(); + for (Long billId : billIds) { - if (billId != null && !billId.isBlank()) + if (billId != null) { - unique.add(billId.trim()); + unique.add(billId); } } - List ids = new ArrayList<>(unique); + List ids = new ArrayList<>(unique); String operator = currentOperator(); for (int from = 0; from < ids.size(); from += BATCH_SIZE) { - List chunk = ids.subList(from, Math.min(from + BATCH_SIZE, ids.size())); + List chunk = ids.subList(from, Math.min(from + BATCH_SIZE, ids.size())); payBillMapper.insertMissingPayBills(chunk, operator); payBillFeeMapper.bindPayBillId(chunk); payBillMapper.refreshPayTotal(chunk); - List longIds = new ArrayList<>(chunk.size()); - for (String id : chunk) - { - if (id == null || id.isBlank()) - { - continue; - } - try - { - longIds.add(Long.valueOf(id.trim())); - } - catch (NumberFormatException ignore) - { - } - } - if (!longIds.isEmpty()) - { - orderBillMapper.refreshPayTotalFromFees(longIds); - } + orderBillMapper.refreshPayTotalFromFees(chunk); } } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirAllocServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirAllocServiceImpl.java index 5795f947..b249f980 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirAllocServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirAllocServiceImpl.java @@ -95,7 +95,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService throw new ServiceException(fee.getBillCode() + " " + blankName(fee) + ":" + reason); } } - Map payBillIds = payBillIds(orders); + Map payBillIds = payBillIds(orders); List batch = new ArrayList<>(BATCH_SIZE); int lineCount = 0; for (SrvBillAirAllocFee fee : fees) @@ -168,7 +168,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService Map> grouped = new LinkedHashMap<>(); for (SrvBillAirAllocOrder order : allocMapper.selectOrders(codes)) { - if (order.getBillId() == null || order.getBillId().isBlank()) + if (order.getBillId() == null) { continue; } @@ -177,9 +177,9 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService return grouped; } - private Map payBillIds(Map> orders) + private Map payBillIds(Map> orders) { - List billIds = new ArrayList<>(); + List billIds = new ArrayList<>(); for (List rows : orders.values()) { for (SrvBillAirAllocOrder order : rows) @@ -187,10 +187,10 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService billIds.add(order.getBillId()); } } - Map payIds = new LinkedHashMap<>(); + Map payIds = new LinkedHashMap<>(); for (int from = 0; from < billIds.size(); from += BATCH_SIZE) { - List chunk = billIds.subList(from, Math.min(from + BATCH_SIZE, billIds.size())); + List chunk = billIds.subList(from, Math.min(from + BATCH_SIZE, billIds.size())); for (PrcPayBill payBill : allocMapper.selectPayBills(chunk)) { if (payBill.getBillId() != null && payBill.getPayBillId() != null) @@ -231,7 +231,7 @@ public class SrvBillAirAllocServiceImpl implements ISrvBillAirAllocService return ""; } - private PrcPayBillFee toOrderFee(SrvBillAirAllocFee fee, SrvBillAirAllocOrder order, BigDecimal amount, Map payBillIds) + private PrcPayBillFee toOrderFee(SrvBillAirAllocFee fee, SrvBillAirAllocOrder order, BigDecimal amount, Map payBillIds) { PrcPayBillFee row = new PrcPayBillFee(); row.setFeeId(UUID.randomUUID().toString()); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java index e5783b1f..90de96cc 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/SrvBillAirFeeServiceImpl.java @@ -409,7 +409,7 @@ public class SrvBillAirFeeServiceImpl implements ISrvBillAirFeeService } Operator operator = operator(); Date now = DateUtils.getNowDate(); - List affectedBills = payBillFeeMapper.selectBillIdsByLadingFee(feeId); + List affectedBills = payBillFeeMapper.selectBillIdsByLadingFee(feeId); payBillFeeMapper.markLadingFeeDeleted(feeId); payBillFeeService.refreshTotals(affectedBills); if (feeMapper.voidFee(feeId, code, operator.account, now) != 1) diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml index 9e3b64ee..984484f6 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillFeeMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark, fee_source, source_id, is_deleted, create_time from prc_pay_bill_fee @@ -74,14 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{billId} - select distinct bill_id from prc_pay_bill_fee where fee_source = 'LADING' and sc_id = #{feeId} and ifnull(is_deleted, '0') = '0' and bill_id is not null - and bill_id != '' @@ -100,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{feeId} - + delete from prc_pay_bill_fee where bill_id = #{billId} and (fee_source is null or fee_source = '' or fee_source = 'CALC') diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml index 60d134be..34cd347e 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcPayBillMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from prc_pay_bill - where bill_id = #{billId} @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{billId} - + delete from prc_pay_bill where bill_id = #{billId} diff --git a/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml index d402a501..74aaee47 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/UuidToNewSyncMapper.xml @@ -257,18 +257,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where prc_income_bill_fee_id = #{oldFeeId} - + update prc_pay_bill - set order_id = #{newBillId} - where bill_id = #{oldBillId} + set bill_id = #{newBillId} + where bill_id_old = #{oldBillId} update prc_pay_bill_fee - set order_id = #{newBillId} - where bill_id = #{oldBillId} + set bill_id = #{newBillId} + where bill_id_old = #{oldBillId} @@ -279,8 +279,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pay_bill_line - set order_id = #{newBillId} - where order_bill_id = #{oldBillId} + set order_bill_id = #{newBillId} + where order_bill_id_old = #{oldBillId} diff --git a/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql b/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql index c6f46c2f..a3d55f63 100644 --- a/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql +++ b/bms-back/sql/uuid_to_bi_shadow/20261116_rename_shadow_to_primary.sql @@ -1,5 +1,6 @@ -- 切主:1) 阴影表升为正式表名,旧 UUID 表改为 *_old -- 2) prc_billing_task 用 order_id(bigint)替代 bill_id +-- 3) 应付关联列升主:order_id -> bill_id/order_bill_id,旧 UUID -> *_old -- 执行前必须:停应用、关闭 UuidToNew 连续同步 -- 可重入 @@ -62,3 +63,105 @@ SET @sql := IF(@has_idx = 0, 'ALTER TABLE `prc_billing_task` ADD KEY `idx_billing_task_order_id` (`order_id`)', 'SELECT ''idx_billing_task_order_id already exists'''); PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; + +-- ========== 3. 应付关联列升主:prc_pay_bill / prc_pay_bill_fee / pay_bill_line ========== +DROP PROCEDURE IF EXISTS `mig_promote_pay_order_id`; +DELIMITER $$ +CREATE PROCEDURE `mig_promote_pay_order_id`( + IN p_table VARCHAR(64), + IN p_live_col VARCHAR(64), + IN p_old_col VARCHAR(64) +) +BEGIN + DECLARE v_has_order INT DEFAULT 0; + DECLARE v_has_live INT DEFAULT 0; + DECLARE v_has_old INT DEFAULT 0; + DECLARE v_live_type VARCHAR(64) DEFAULT NULL; + DECLARE v_fk VARCHAR(128) DEFAULT NULL; + DECLARE done INT DEFAULT 0; + DECLARE cur CURSOR FOR + SELECT CONSTRAINT_NAME + FROM information_schema.KEY_COLUMN_USAGE + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = p_table + AND COLUMN_NAME = p_live_col + AND REFERENCED_TABLE_NAME IS NOT NULL; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1; + + SELECT COUNT(*) INTO v_has_order + FROM information_schema.columns + WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = 'order_id'; + SELECT COUNT(*) INTO v_has_live + FROM information_schema.columns + WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_live_col; + SELECT COUNT(*) INTO v_has_old + FROM information_schema.columns + WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_old_col; + + IF v_has_live = 1 THEN + SELECT DATA_TYPE INTO v_live_type + FROM information_schema.columns + WHERE table_schema = DATABASE() AND table_name = p_table AND column_name = p_live_col + LIMIT 1; + END IF; + + IF v_has_old = 1 AND v_has_order = 0 AND v_has_live = 1 AND v_live_type IN ('bigint','int','mediumint','smallint','tinyint') THEN + SELECT CONCAT('skip ', p_table, ': already promoted') AS msg; + ELSEIF v_has_order = 1 AND v_has_live = 1 AND v_has_old = 0 THEN + SET done = 0; + OPEN cur; + fk_loop: LOOP + FETCH cur INTO v_fk; + IF done = 1 THEN + LEAVE fk_loop; + END IF; + SET @ddl = CONCAT('ALTER TABLE `', p_table, '` DROP FOREIGN KEY `', v_fk, '`'); + PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; + END LOOP; + CLOSE cur; + SET @ddl = CONCAT( + 'ALTER TABLE `', p_table, '` ', + 'CHANGE COLUMN `', p_live_col, '` `', p_old_col, '` varchar(36) NULL COMMENT ''旧UUID订单ID'', ', + 'CHANGE COLUMN `order_id` `', p_live_col, '` bigint DEFAULT NULL COMMENT ''对应 prc_order_bill.bill_id''' + ); + PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; + SELECT CONCAT('promoted ', p_table, ': order_id -> ', p_live_col, ', ', p_live_col, ' -> ', p_old_col) AS msg; + ELSEIF v_has_order = 1 AND v_has_live = 0 THEN + SET @ddl = CONCAT( + 'ALTER TABLE `', p_table, '` CHANGE COLUMN `order_id` `', p_live_col, + '` bigint DEFAULT NULL COMMENT ''对应 prc_order_bill.bill_id''' + ); + PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt; + SELECT CONCAT('renamed ', p_table, '.order_id -> ', p_live_col) AS msg; + ELSE + SELECT CONCAT('skip ', p_table, ': unexpected column state') AS msg; + END IF; +END$$ +DELIMITER ; + +CALL mig_promote_pay_order_id('prc_pay_bill', 'bill_id', 'bill_id_old'); +CALL mig_promote_pay_order_id('prc_pay_bill_fee', 'bill_id', 'bill_id_old'); +CALL mig_promote_pay_order_id('pay_bill_line', 'order_bill_id', 'order_bill_id_old'); + +DROP PROCEDURE IF EXISTS `mig_promote_pay_order_id`; + +-- 补回 prc_pay_bill.bill_id 唯一约束(旧 uk 若还在 bill_id_old 上则先掉) +SET @uk_on_old := ( + SELECT COUNT(*) FROM information_schema.statistics + WHERE table_schema = DATABASE() AND table_name = 'prc_pay_bill' AND index_name = 'uk_pay_bill_order_bill' + AND column_name = 'bill_id_old' +); +SET @sql := IF(@uk_on_old > 0, + 'ALTER TABLE `prc_pay_bill` DROP INDEX `uk_pay_bill_order_bill`', + 'SELECT ''no uk on bill_id_old'''); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; + +SET @has_uk := ( + SELECT COUNT(*) FROM information_schema.statistics + WHERE table_schema = DATABASE() AND table_name = 'prc_pay_bill' AND index_name = 'uk_pay_bill_order_bill' + AND column_name = 'bill_id' +); +SET @sql := IF(@has_uk = 0, + 'ALTER TABLE `prc_pay_bill` ADD UNIQUE KEY `uk_pay_bill_order_bill` (`bill_id`)', + 'SELECT ''uk_pay_bill_order_bill already on bill_id'''); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;