diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java index 3b1ef384..6998bea7 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java @@ -34,6 +34,7 @@ import com.bms.receivable.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillListExportRow; import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillPreviewOrder; import com.bms.receivable.service.IArBillService; import com.bms.receivable.service.ArBillVoidTaskService; import com.bms.receivable.security.ArBillScopeResolver; @@ -175,7 +176,7 @@ public class ArBillController extends BaseController { List list = billService.previewBill(query); TableDataInfo pageData = getDataTable(list); AjaxResult result = success(); - result.put("rows", pageData.getRows()); + result.put("rows", list.stream().map(ArBillPreviewOrder::from).toList()); result.put("total", pageData.getTotal()); return result; } @@ -219,7 +220,7 @@ public class ArBillController extends BaseController { List list = billService.previewExcludedBill(query); TableDataInfo pageData = getDataTable(list); AjaxResult result = success(); - result.put("rows", pageData.getRows()); + result.put("rows", list.stream().map(ArBillPreviewOrder::from).toList()); result.put("total", pageData.getTotal()); result.put("totalAmount", billService.sumPreviewBill(query)); return result; diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java index 15dedf01..40149cd8 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java @@ -17,7 +17,8 @@ public class ArBillDetail implements Serializable { private Long detailId; private Long arBillId; - private String prcOrderBillId; + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long prcOrderBillId; private Integer detailNo; private String orderNo; private String trackingNo; diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java index e0d0240e..41b80d01 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java @@ -16,7 +16,8 @@ public class ArBillDetailFee implements Serializable { private Long detailFeeId; private Long detailId; - private String prcIncomeBillFeeId; + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long prcIncomeBillFeeId; private Integer feeNo; private String feeType; private String feeName; diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java index 9115ac49..309f4ee2 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java @@ -40,8 +40,9 @@ public class ArBillGenerateTask implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date snapshotCreateTime; /** - * 按 bill_id 字典序处理的游标。 + * 按 bill_id 数值顺序处理的游标。 */ + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long lastSourceBillId; /** * 待处理总数;全选模式统计完成前使用 -1。 diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillPreviewOrder.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillPreviewOrder.java new file mode 100644 index 00000000..9b9ff665 --- /dev/null +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillPreviewOrder.java @@ -0,0 +1,22 @@ +package com.bms.receivable.domain.vo; + +import com.bms.price.domain.PrcOrderBill; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.beans.BeanUtils; + +/** 应收生成预览中,订单 ID 以字符串传递,避免浏览器整数精度丢失。 */ +public class ArBillPreviewOrder extends PrcOrderBill { + private static final long serialVersionUID = 1L; + + public static ArBillPreviewOrder from(PrcOrderBill source) { + ArBillPreviewOrder result = new ArBillPreviewOrder(); + BeanUtils.copyProperties(source, result); + return result; + } + + @Override + @JsonFormat(shape = JsonFormat.Shape.STRING) + public Long getBillId() { + return super.getBillId(); + } +} diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java index 849a6fbd..0456b3df 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java @@ -5,6 +5,7 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import com.bms.receivable.domain.ArBillGenerateTask; +import com.bms.price.migration.domain.UuidToNewIdHolder; /** * 应收账单异步生成任务 Mapper。 @@ -21,6 +22,9 @@ public interface ArBillGenerateTaskMapper { List selectWaiting(@Param("limit") int limit); + /** 历史失败任务重试时,将请求快照中的旧订单 UUID 转为新 ID。 */ + List selectMigratedOrderIds(@Param("oldIds") List oldIds); + int insert(ArBillGenerateTask task); int markRunning(@Param("taskId") Long taskId, @Param("startedAt") Date startedAt); diff --git a/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java index 87844040..df02f710 100644 --- a/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java @@ -19,6 +19,7 @@ import java.util.Date; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.regex.Matcher; @@ -45,6 +46,8 @@ import org.springframework.transaction.support.TransactionTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import com.bms.receivable.domain.ArBill; import com.bms.receivable.domain.ArBankAccount; import com.bms.receivable.domain.ArBillDetail; @@ -105,6 +108,7 @@ import com.bms.price.enums.BillBillingFailStatus; import com.bms.price.mapper.PrcIncomeBillMapper; import com.bms.price.mapper.PrcIncomeBillFeeMapper; import com.bms.price.mapper.PrcOrderBillMapper; +import com.bms.price.migration.domain.UuidToNewIdHolder; /** * 应收账单核心业务实现。 @@ -605,7 +609,7 @@ public class ArBillServiceImpl implements IArBillService { if (!ArBillGenerateTaskStatus.FAILED.equals(task.getStatus())) { throw new ServiceException("只有失败的账单生成任务可以重试"); } - ArBillGenerateRequest request = JSON.parseObject(task.getRequestPayload(), ArBillGenerateRequest.class); + ArBillGenerateRequest request = parseRetryRequest(task.getRequestPayload()); request.setRequestId(requestId); ArBillGenerateTask retried = generateBill(request, operator, requestId); log.info("应收账单生成任务重试请求已处理,operator={}, requestId={}, sourceTaskId={}, newTaskId={}, status={}, costMs={}", @@ -614,6 +618,52 @@ public class ArBillServiceImpl implements IArBillService { return retried; } + /** 旧失败任务的选择快照可能保留 UUID;新任务始终使用 bigint ID。 */ + private ArBillGenerateRequest parseRetryRequest(String payload) { + JSONObject data = JSON.parseObject(payload); + Set oldIds = new LinkedHashSet<>(); + for (String field : List.of("sourceBillIds", "excludedSourceBillIds")) { + JSONArray ids = data.getJSONArray(field); + if (ids == null) continue; + for (Object value : ids) { + if (value instanceof String text && !isLongId(text)) oldIds.add(text.toLowerCase(Locale.ROOT)); + } + } + if (!oldIds.isEmpty()) { + List ids = new ArrayList<>(oldIds); + Map mapping = new HashMap<>(); + for (int start = 0; start < ids.size(); start += 500) { + for (UuidToNewIdHolder row : generateTaskMapper.selectMigratedOrderIds( + ids.subList(start, Math.min(start + 500, ids.size())))) { + mapping.put(row.getOldBillId().toLowerCase(Locale.ROOT), row.getNewBillId()); + } + } + if (mapping.size() != oldIds.size()) { + throw new ServiceException("历史任务的部分订单尚未完成 ID 映射,请重新选择订单生成账单"); + } + for (String field : List.of("sourceBillIds", "excludedSourceBillIds")) { + JSONArray values = data.getJSONArray(field); + if (values == null) continue; + for (int i = 0; i < values.size(); i++) { + Object value = values.get(i); + if (value instanceof String text && mapping.containsKey(text.toLowerCase(Locale.ROOT))) { + values.set(i, mapping.get(text.toLowerCase(Locale.ROOT))); + } + } + } + } + return JSON.parseObject(data.toJSONString(), ArBillGenerateRequest.class); + } + + private boolean isLongId(String value) { + try { + Long.parseLong(value); + return true; + } catch (NumberFormatException e) { + return false; + } + } + /** * 执行异步生成任务。每个批次使用短事务,事务内完成来源订单占用、明细落库、 * 费用落库和任务游标更新;异常统一进入独立事务清理,避免任务永久卡在运行中。 @@ -853,7 +903,7 @@ public class ArBillServiceImpl implements IArBillService { // 失败订单先落快照,再汇总占用状态,避免无费用订单被错误恢复为 UNBILLED。 sourceBillMapper.refreshArBillStatusByBillIds(currentSourceBillIds); - Map detailsBySourceBill = new HashMap<>(); + Map detailsBySourceBill = new HashMap<>(); for (ArBillDetail detail : detailMapper.selectByBillIdAndSourceIds(bill.getArBillId(), currentSourceBillIds)) { detailsBySourceBill.put(detail.getPrcOrderBillId(), detail); } @@ -865,7 +915,7 @@ public class ArBillServiceImpl implements IArBillService { Map feeNumbers = new HashMap<>(); if (sourceFees != null) { for (PrcIncomeBillFee sourceFee : sourceFees) { - ArBillDetail detail = detailsBySourceBill.get(String.valueOf(sourceFee.getBillId())); + ArBillDetail detail = detailsBySourceBill.get(sourceFee.getBillId()); if (detail == null) { throw new ServiceException("来源费用找不到对应的账单明细:" + sourceFee.getBillId()); } @@ -1268,7 +1318,7 @@ public class ArBillServiceImpl implements IArBillService { int detailNo, String operator) { ArBillDetail detail = new ArBillDetail(); detail.setArBillId(bill.getArBillId()); - detail.setPrcOrderBillId(String.valueOf(source.getBillId())); + detail.setPrcOrderBillId(source.getBillId()); detail.setDetailNo(detailNo); detail.setOrderNo(source.getOrderNo()); detail.setTrackingNo(source.getTrackingNo()); @@ -1304,7 +1354,7 @@ public class ArBillServiceImpl implements IArBillService { private ArBillDetailFee toDetailFee(ArBillDetail detail, PrcIncomeBillFee source, int feeNo, String operator) { ArBillDetailFee fee = new ArBillDetailFee(); fee.setDetailId(detail.getDetailId()); - fee.setPrcIncomeBillFeeId(String.valueOf(source.getFeeId())); + fee.setPrcIncomeBillFeeId(source.getFeeId()); fee.setFeeNo(feeNo); fee.setFeeType(source.getFeeType()); fee.setFeeName(source.getFeeName()); diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index fdfb1421..51a928c6 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -785,7 +785,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +