✨ 补充应收账单用户ID记录及迁移脚本

2026-10-19 15:51:47 +08:00
parent 5bb9000e8e
commit 1986a901d9
13 changed files with 636 additions and 25 deletions
@@ -77,6 +77,8 @@ public class ArBill extends BaseEntity {
    private String confirmedBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date confirmedTime;
+    /** 创建账单的用户主键。 */
+    private Long createUserId;

    /**
     * 账单明细；详情接口分页查询时通常不直接填充该集合。
@@ -46,6 +46,8 @@ public class ArBillExport implements Serializable {
     * 导出状态：PROCESSING生成中、SUCCESS成功可下载、FAILED失败。
     */
    private String exportStatus;
+    /** 发起导出的用户主键。 */
+    private Long exportUserId;
    private String exportBy;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date exportTime;
@@ -75,6 +75,8 @@ public class ArBillGenerateTask implements Serializable {
     * 发起任务的用户。
     */
    private String createBy;
+    /** 创建任务的用户主键。 */
+    private Long createUserId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -33,7 +33,7 @@ public class ArBillLog implements Serializable {
    private String toStatus;
    private String beforeData;
    private String afterData;
-    private String operatorId;
+    private Long operatorId;
    private String operatorName;
    /**
     * 操作来源：WEB网页端、API接口、JOB定时任务、IMPORT数据导入。
@@ -12,5 +12,5 @@ public interface IArBillLogService {
    void record(ArBillLog log);

    void recordFailure(Long arBillId, ArLogObjectType objectType, String objectId, ArLogOperationType operationType,
-                       String fromStatus, String message, String operator, String requestId);
+                       String fromStatus, String message, Long operatorId, String operatorName, String requestId);
 }
@@ -26,11 +26,11 @@ import com.bms.ar.mapper.ArBillMapper;
 import com.bms.ar.service.IArBalanceWriteoffService;
 import com.bms.ar.service.IArBillLogService;
 import com.bms.common.exception.ServiceException;
+import com.bms.common.utils.SecurityUtils;
 import com.bms.customer.customermoney.domain.CustomerReceipt;
 import com.bms.customer.customermoney.domain.ReceiptWriteoffPlan;
 import com.bms.customer.customermoney.mapper.CustomerMoneyMapper;
 import com.bms.customer.customermoney.mapper.ReceiptWriteoffPlanMapper;
-import com.bms.common.utils.SecurityUtils;
 import com.bms.common.utils.uuid.IdUtils;

 /**
@@ -286,7 +286,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
        log.setOperationDesc(desc);
        log.setFromStatus(fromStatus);
        log.setToStatus(toStatus);
-        log.setOperatorId(operator);
+        log.setOperatorId(SecurityUtils.getUserId());
        log.setOperatorName(operator);
        log.setOperationSource(ArLogOperationSource.WEB.getCode());
        log.setRequestId(requestId);
@@ -36,7 +36,7 @@ public class ArBillLogServiceImpl implements IArBillLogService {
    @Override
    @Transactional(propagation = Propagation.REQUIRES_NEW)
    public void recordFailure(Long arBillId, ArLogObjectType objectType, String objectId, ArLogOperationType operationType,
-                              String fromStatus, String message, String operator, String requestId) {
+                              String fromStatus, String message, Long operatorId, String operatorName, String requestId) {
        ArBillLog log = new ArBillLog();
        log.setArBillId(arBillId);
        log.setObjectType(objectType.getCode());
@@ -44,8 +44,8 @@ public class ArBillLogServiceImpl implements IArBillLogService {
        log.setOperationType(operationType.getCode());
        log.setOperationDesc(message);
        log.setFromStatus(fromStatus);
-        log.setOperatorId(operator);
-        log.setOperatorName(operator);
+        log.setOperatorId(operatorId);
+        log.setOperatorName(operatorName);
        log.setOperationSource(ArLogOperationSource.WEB.getCode());
        log.setRequestId(requestId == null ? IdUtils.fastSimpleUUID() : requestId);
        log.setResult(ArLogResult.FAILED.getCode());
@@ -81,6 +81,7 @@ import com.bms.ar.domain.vo.ArBillQuery;
 import com.bms.common.config.BmsConfig;
 import com.bms.common.exception.ServiceException;
 import com.bms.common.utils.DateUtils;
+import com.bms.common.utils.SecurityUtils;
 import com.bms.common.utils.StringUtils;
 import com.bms.common.utils.file.FileUtils;
 import com.bms.common.utils.file.OssStorage;
@@ -326,6 +327,7 @@ public class ArBillServiceImpl implements IArBillService {
    @Transactional(rollbackFor = Exception.class)
    public ArBillGenerateTask generateBill(ArBillGenerateRequest request, String operator, String requestId) {
        long startedAt = System.nanoTime();
+        Long createUserId = SecurityUtils.getUserId();
        validatePeriod(request);
        ArBillGenerateTask existed = generateTaskMapper.selectByRequestToken(requestId);
        if (existed != null) {
@@ -400,6 +402,7 @@ public class ArBillServiceImpl implements IArBillService {
        bill.setBankName(bankAccount.getBankName());
        bill.setRemark(request.getRemark());
        bill.setCreateBy(operator);
+        bill.setCreateUserId(createUserId);
        bill.setUpdateBy(operator);
        billMapper.insertArBill(bill);

@@ -417,6 +420,7 @@ public class ArBillServiceImpl implements IArBillService {
        task.setStatus(ArBillGenerateTaskStatus.WAITING);
        task.setRequestToken(requestId);
        task.setCreateBy(operator);
+        task.setCreateUserId(createUserId);
        generateTaskMapper.insert(task);
        eventPublisher.publishEvent(new ArBillGenerateTaskEvent(task.getTaskId()));
        log.info("应收账单生成任务已创建，operator={}, requestId={}, customerId={}, billPeriodEnd={}, selectionMode={}, selectedCount={}, excludedCount={}, taskId={}, status={}, costMs={}",
@@ -798,7 +802,7 @@ public class ArBillServiceImpl implements IArBillService {
            try {
                logService.recordFailure(task.getArBillId(), ArLogObjectType.BILL,
                        String.valueOf(task.getTaskId()), ArLogOperationType.CREATE, ArBillStatus.DRAFT.getCode(),
-                        message, operator, requestId);
+                        message, task.getCreateUserId(), operator, requestId);
            } catch (Exception logException) {
                log.warn("账单生成失败日志写入失败，但任务清理已完成，taskId={}", task.getTaskId(), logException);
            }
@@ -851,7 +855,7 @@ public class ArBillServiceImpl implements IArBillService {
        }
        recordSuccess(finalBill, ArLogObjectType.BILL, ArLogOperationType.CREATE,
                "异步生成正式账单", ArBillStatus.DRAFT.getCode(), ArBillStatus.DRAFT.getCode(),
-                task.getRequestToken(), task.getCreateBy());
+                task.getRequestToken(), task.getCreateUserId(), task.getCreateBy());
    }

    private String generateFailureMessage(Exception e) {
@@ -903,7 +907,8 @@ public class ArBillServiceImpl implements IArBillService {
        }
        // 应收账单只负责形成应收，不参与客户余额或授信额度变更。
        recordSuccess(bill, ArLogObjectType.BILL, ArLogOperationType.CONFIRM,
-                "确认应收账单", ArBillStatus.DRAFT.getCode(), ArBillStatus.CONFIRMED.getCode(), requestId, operator);
+                "确认应收账单", ArBillStatus.DRAFT.getCode(), ArBillStatus.CONFIRMED.getCode(), requestId,
+                SecurityUtils.getUserId(), operator);
        ArBill result = selectArBillById(arBillId);
        log.info("应收账单确认处理完成，operator={}, requestId={}, arBillId={}, status={}, costMs={}",
                safeLogValue(operator), safeLogValue(requestId), arBillId, result.getStatus(), elapsedMillis(startedAt));
@@ -946,7 +951,8 @@ public class ArBillServiceImpl implements IArBillService {
        sourceFeeMapper.restoreUnbilledIfNoActiveArBillByArBillId(arBillId);
        sourceBillMapper.refreshArBillStatusByArBillId(arBillId);
        recordSuccess(bill, ArLogObjectType.BILL, ArLogOperationType.VOID,
-                "作废应收账单：" + remark, bill.getStatus(), ArBillStatus.VOID.getCode(), requestId, operator);
+                "作废应收账单：" + remark, bill.getStatus(), ArBillStatus.VOID.getCode(), requestId,
+                SecurityUtils.getUserId(), operator);
        ArBill result = selectArBillById(arBillId);
        log.info("应收账单作废处理完成，operator={}, requestId={}, arBillId={}, status={}, costMs={}",
                safeLogValue(operator), safeLogValue(requestId), arBillId, result.getStatus(), elapsedMillis(startedAt));
@@ -960,6 +966,7 @@ public class ArBillServiceImpl implements IArBillService {
    @Transactional(rollbackFor = Exception.class)
    public ArBillExport exportBill(Long arBillId, String operator, String requestId) {
        long startedAt = System.nanoTime();
+        Long exportUserId = SecurityUtils.getUserId();
        ArBillLog previous = logMapper.selectSuccessByRequestId(requestId, ArLogObjectType.EXPORT.getCode(),
                ArLogResult.SUCCESS.getCode());
        if (previous != null && isNumber(previous.getObjectId())) {
@@ -1010,13 +1017,15 @@ public class ArBillServiceImpl implements IArBillService {
        export.setTemplateStorageType(template.getStorageType());
        export.setTemplateStorageKey(template.getStorageKey());
        export.setTemplateHash(template.getFileHash());
+        export.setExportUserId(exportUserId);
        export.setExportBy(operator);
        export.setRowCount(bill.getOrderCount());
        export.setStorageKey("");
        export.setExportStatus(ArExportStatus.PROCESSING.getCode());
        exportMapper.insert(export);
        recordSuccess(bill, ArLogObjectType.EXPORT, ArLogOperationType.EXPORT,
-                "已提交账单导出任务", bill.getStatus(), bill.getStatus(), requestId, operator, export.getExportId());
+                "已提交账单导出任务", bill.getStatus(), bill.getStatus(), requestId,
+                exportUserId, operator, export.getExportId());
        eventPublisher.publishEvent(new ArBillExportTaskEvent(export.getExportId()));
        log.info("应收账单导出任务已创建，operator={}, requestId={}, arBillId={}, exportId={}, status={}, costMs={}",
                safeLogValue(operator), safeLogValue(requestId), arBillId, export.getExportId(),
@@ -1087,7 +1096,8 @@ public class ArBillServiceImpl implements IArBillService {
                    exportId, export.getArBillId(), safeLogValue(message), elapsedMillis(startedAt), e);
            if (exportMapper.markFailed(exportId, message) > 0) {
                logService.recordFailure(export.getArBillId(), ArLogObjectType.EXPORT, String.valueOf(exportId),
-                        ArLogOperationType.EXPORT, bill == null ? null : bill.getStatus(), message, export.getExportBy(), null);
+                        ArLogOperationType.EXPORT, bill == null ? null : bill.getStatus(), message,
+                        export.getExportUserId(), export.getExportBy(), null);
            }
        } finally {
            if (temp != null) {
@@ -1233,12 +1243,13 @@ public class ArBillServiceImpl implements IArBillService {
    }

    private void recordSuccess(ArBill bill, ArLogObjectType objectType, ArLogOperationType operationType, String desc, String fromStatus,
-                               String toStatus, String requestId, String operator) {
-        recordSuccess(bill, objectType, operationType, desc, fromStatus, toStatus, requestId, operator, null);
+                               String toStatus, String requestId, Long operatorId, String operatorName) {
+        recordSuccess(bill, objectType, operationType, desc, fromStatus, toStatus, requestId,
+                operatorId, operatorName, null);
    }

    private void recordSuccess(ArBill bill, ArLogObjectType objectType, ArLogOperationType operationType, String desc, String fromStatus,
-                               String toStatus, String requestId, String operator, Long objectId) {
+                               String toStatus, String requestId, Long operatorId, String operatorName, Long objectId) {
        ArBillLog log = new ArBillLog();
        log.setArBillId(bill.getArBillId());
        log.setObjectType(objectType.getCode());
@@ -1249,8 +1260,8 @@ public class ArBillServiceImpl implements IArBillService {
        log.setToStatus(toStatus);
        log.setBeforeData(safeStatusJson(fromStatus));
        log.setAfterData(safeStatusJson(toStatus));
-        log.setOperatorId(operator);
-        log.setOperatorName(operator);
+        log.setOperatorId(operatorId);
+        log.setOperatorName(operatorName);
        log.setOperationSource(ArLogOperationSource.WEB.getCode());
        log.setRequestId(requestId);
        log.setResult(ArLogResult.SUCCESS.getCode());
@@ -1259,7 +1270,8 @@ public class ArBillServiceImpl implements IArBillService {

    private ServiceException failure(Long arBillId, ArLogObjectType objectType, String objectId, ArLogOperationType operationType,
                                     String fromStatus, String message, String operator, String requestId) {
-        logService.recordFailure(arBillId, objectType, objectId, operationType, fromStatus, message, operator, requestId);
+        logService.recordFailure(arBillId, objectType, objectId, operationType, fromStatus, message,
+                SecurityUtils.getUserId(), operator, requestId);
        return new ServiceException(message);
    }

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="fileHash" column="file_hash"/>
        <result property="rowCount" column="row_count"/>
        <result property="exportStatus" column="export_status"/>
+        <result property="exportUserId" column="export_user_id"/>
        <result property="exportBy" column="export_by"/>
        <result property="exportTime" column="export_time"/>
        <result property="remark" column="remark"/>
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               file_hash,
               row_count,
               export_status,
+               export_user_id,
               export_by,
               export_time,
               remark
@@ -71,11 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        insert into ar_bill_detail_export (
            ar_bill_id, file_name, file_type, template_id, template_code, template_version,
            template_storage_type, template_storage_key, template_hash, storage_key,
-            file_size, file_hash, row_count, export_status, export_by, export_time, remark
+            file_size, file_hash, row_count, export_status, export_user_id, export_by, export_time, remark
        ) values (
            #{arBillId}, #{fileName}, #{fileType}, #{templateId}, #{templateCode}, #{templateVersion},
            #{templateStorageType}, #{templateStorageKey}, #{templateHash}, #{storageKey},
-            #{fileSize}, #{fileHash}, #{rowCount}, #{exportStatus}, #{exportBy}, sysdate(), #{remark}
+            #{fileSize}, #{fileHash}, #{rowCount}, #{exportStatus}, #{exportUserId}, #{exportBy}, sysdate(), #{remark}
        )
    </insert>

@@ -20,6 +20,7 @@
        <result property="errorMessage" column="error_message"/>
        <result property="requestToken" column="request_token"/>
        <result property="createBy" column="create_by"/>
+        <result property="createUserId" column="create_user_id"/>
        <result property="createTime" column="create_time"/>
        <result property="startedAt" column="started_at"/>
        <result property="heartbeatTime" column="heartbeat_time"/>
@@ -42,6 +43,7 @@
               error_message,
               request_token,
               create_by,
+               create_user_id,
               create_time,
               started_at,
               heartbeat_time,
@@ -79,11 +81,11 @@
        insert into ar_bill_generate_task (task_no, ar_bill_id, selection_mode, request_payload, snapshot_create_time,
                                           last_source_bill_id, total_count, processed_count, success_count,
                                           total_amount,
-                                           status, error_message, request_token, create_by, create_time, started_at,
+                                           status, error_message, request_token, create_by, create_user_id, create_time, started_at,
                                           heartbeat_time, finished_at)
        values (#{taskNo}, #{arBillId}, #{selectionMode}, #{requestPayload}, #{snapshotCreateTime},
                #{lastSourceBillId}, #{totalCount}, #{processedCount}, #{successCount}, #{totalAmount},
-                #{status}, #{errorMessage}, #{requestToken}, #{createBy}, sysdate(), #{startedAt},
+                #{status}, #{errorMessage}, #{requestToken}, #{createBy}, #{createUserId}, sysdate(), #{startedAt},
                #{heartbeatTime}, #{finishedAt})
    </insert>

@@ -29,6 +29,7 @@
        <result property="confirmedBy" column="confirmed_by"/>
        <result property="confirmedTime" column="confirmed_time"/>
        <result property="createBy" column="create_by"/>
+        <result property="createUserId" column="create_user_id"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
@@ -59,6 +60,7 @@
               confirmed_by,
               confirmed_time,
               create_by,
+               create_user_id,
               create_time,
               update_by,
               update_time
@@ -138,13 +140,13 @@
                             bill_date, currency, order_count, total_amount, written_off_amount, unwritten_amount,
                             status, generation_status, bill_version, bank_account_name, bank_account_no, bank_name,
                             remark,
-                             confirmed_by, confirmed_time, create_by, create_time, update_by, update_time)
+                             confirmed_by, confirmed_time, create_by, create_user_id, create_time, update_by, update_time)
        values (#{billNo}, #{billName}, #{customerId}, #{customerCode}, #{customerName}, #{billPeriodStart},
                #{billPeriodEnd},
                #{billDate}, #{currency}, #{orderCount}, #{totalAmount}, #{writtenOffAmount}, #{unwrittenAmount},
                #{status}, #{generationStatus}, #{billVersion}, #{bankAccountName}, #{bankAccountNo}, #{bankName},
                #{remark},
-                #{confirmedBy}, #{confirmedTime}, #{createBy}, sysdate(), #{updateBy}, sysdate())
+                #{confirmedBy}, #{confirmedTime}, #{createBy}, #{createUserId}, sysdate(), #{updateBy}, sysdate())
    </insert>

    <update id="updateArBillStatus">