Merge remote-tracking branch 'origin/test' into dev-ty1.2

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderAdjustService.java

@@ -0,0 +1,826 @@
+package com.mhd.oms.application.service.businessDocumentOrder;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mhd.common.core.domain.dto.wlhy.TmsAddressMultiDTO;
+import com.mhd.common.core.domain.dto.wlhy.TmsCargoInfoDTO;
+import com.mhd.common.core.domain.dto.wlhy.TmsOrderAccount;
+import com.mhd.common.core.exception.ServiceException;
+import com.mhd.common.core.web.domain.AjaxResult;
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.oms.domain.businessDocumentAddressMulti.entity.BusinessDocumentAddressMulti;
+import com.mhd.oms.domain.businessDocumentAddressMulti.repository.mapper.BusinessDocumentAddressMultiMapper;
+import com.mhd.oms.domain.businessDocumentCargoMulti.entity.BusinessDocumentCargoMulti;
+import com.mhd.oms.domain.businessDocumentCargoMulti.repository.mapper.BusinessDocumentCargoMultiMapper;
+import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
+import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
+import com.mhd.oms.domain.businessDocumentOrderAdjust.entity.BusinessDocumentOrderAdjust;
+import com.mhd.oms.domain.businessDocumentOrderAdjust.repository.mapper.BusinessDocumentOrderAdjustMapper;
+import com.mhd.oms.domain.businessDocumentOrderAdjustDetail.entity.BusinessDocumentOrderAdjustDetail;
+import com.mhd.oms.domain.businessDocumentOrderAdjustDetail.repository.mapper.BusinessDocumentOrderAdjustDetailMapper;
+import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
+import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
+import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder;
+import com.mhd.oms.domain.executeOrder.repository.mapper.ExecuteOrderMapper;
+import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustAuditDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustQueryDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustRecordDTO;
+import com.mhd.system.api.WlhyServiceFeign;
+import com.mhd.system.api.domain.TmsOrderAddDTO;
+import com.mhd.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 运输业务单「订单调整」应用服务
+ *
+ * 规则(定稿)：
+ *  1. 每次调整都生成：1 条主记录 + 1 条明细快照
+ *  2. 费用数据源 = 前端回传的费用明细 business_order_account(feeDetailList)；
+ *     主表金额 deliveryFreight 为其 amount 合计(冗余汇总，后端自动算)。
+ *  3. 是否需审核：一旦任一「金额」发生变化
+ *        = feeDetailList 明细 amount 变化，或主表金额/费用列变化 -> 走业务主管审核；
+ *        否则(仅改非金额字段) -> 直通。
+ *        「金额/费用」字段涵盖: deliveryFreight / collectedFreight / uncollectedFreight /
+ *        collectLessFreight / transportationUnitPrice / infoFee / freightUnitPrice /
+ *        cargoInsuranceAmount / freightCharges / freightFee / unloadingFee / customsFee /
+ *        shortageFee / miscellaneousFee / otherFee / detentionFee，以及 settlementCurrency /
+ *        paymentAccountId / accountName / accountInformation(结算币种+收款账户任一变化即视为费用变更)。
+ *        判定口径: 以后端兜底比对为准(主表金额/费用列 + 明细 amount 合计)，
+ *        前端 amountChanged 仅作提示；后端比对结果与前端 OR 运算，避免前端误传 false 绕过审核。
+ *  4. 涉及金额提交 -> 仅把业务单 review_status 置为「调整待审核(3)」；主记录 AUDIT_STATUS=0(待审核)；
+ *     不更新业务单数据，不影响其它状态(order_status / execute_status 不动)。
+ *  5. 审核通过 -> 覆盖业务单(金额) + 替换费用明细；review_status 一律置为 1(已审核)，
+ *     不影响 order_status / execute_status。
+ *    审核驳回 -> 不更新业务单数据，review_status 置为「调整驳回(4)」，不影响 order_status/execute_status，
+ *        可再次调整提交审核。
+ *  6. 直通(未改金额) -> 覆盖业务单可编辑字段 + deliveryFreight(明细合计)，并替换 business_order_account
+ *      (逻辑删旧 is_delete=1 + 插新 is_delete=0)；不改动任何审核/执行状态。
+ *
+ * 说明：review_status 原枚举 0未审/1通过/2驳回，新增 3=调整待审核；不改变原有用例。
+ *
+ * @author dev
+ * @date 2026-09-09
+ */
+@Slf4j
+@Service
+public class BusinessDocumentOrderAdjustService {
+
+    private static final Integer AUDIT_WAIT = 0;   // 调整记录：待审核
+    private static final Integer AUDIT_PASS = 1;   // 调整记录：审核通过
+    private static final Integer AUDIT_REJECT = 2; // 调整记录：驳回
+
+    /** 业务单 review_status：调整待审核(提交涉及金额时置) */
+    private static final Long REVIEW_ADJUST_WAIT = 3L;
+    /** 业务单 review_status：调整驳回(审核驳回时置，与普通驳回 2 区分) */
+    private static final Long REVIEW_ADJUST_REJECT = 4L;
+
+    /** 主表金额(费用)字段，任一变化触发审核
+     *  含: 运费相关 8 项 + 其他费用 8 项 + 结算币种 + 收款账户(3 字段)
+     *  任意一项变化即需要审核(对应前端"费用合计 / 运费 / 装卸费 / 仓租及柜租(走明细) /
+     *  保险 / 压车(走明细) / 运输处理费(走明细) / 报关费 / 其他 / 费用合计 / 结算币种 / 收款账户") */
+    private static final List<String> FEE_FIELDS = Arrays.asList(
+            "deliveryFreight", "collectedFreight", "uncollectedFreight", "collectLessFreight",
+            "transportationUnitPrice", "infoFee", "freightUnitPrice", "cargoInsuranceAmount",
+            "freightCharges", "freightFee", "unloadingFee", "customsFee", "shortageFee",
+            "miscellaneousFee", "otherFee", "detentionFee",
+            // 结算币种 + 收款账户 任一变化也视为费用变更，需审核
+            "settlementCurrency", "paymentAccountId", "accountName", "accountInformation");
+
+    /** 不允许被前端调整覆盖的系统字段 */
+    private static final List<String> PROTECTED_FIELDS = Arrays.asList(
+            "id", "goodsNumber",
+            "orderStatus", "reviewStatus", "reviewId", "review", "reviewTime", "reviewOpinion",
+            "salesManager", "auditStatus", "auditBy", "auditTime",
+            "executeStatus", "executeId", "executeTime", "executor",
+            "executeOrderId", "executeOrderNumber",
+            "isDelete", "delFlag", "createBy", "createByName", "createTime",
+            "updateBy", "updateByName", "updateTime",
+            "pushStatus", "pushTime", "pushBy", "pushByName",
+            "reviseApplyType", "reviseApplyStatus", "reviseApplyBy", "reviseApplyByName",
+            "reviseApplyReason", "reviseApplyTime",
+            "reservationOrderId", "reservationOrderNumber",
+            "mainOrderId", "mainOrderNum", "mergeOrderId", "mergeOrderNum",
+            "splicingOrderType", "splicingStatus", "deliveryProgress",
+            "orgId", "orgName", "organizationId", "organizationName", "topOrganizationId",
+            "realCreateBy", "realCreateName", "createCompanyId", "createUserId",
+            "szwlUserId"
+    );
+
+    @Autowired
+    private BusinessDocumentOrderMapper businessDocumentOrderMapper;
+
+    @Autowired
+    private BusinessOrderAccountMapper businessOrderAccountMapper;
+
+    @Autowired
+    private BusinessDocumentOrderAdjustMapper adjustMapper;
+
+    @Autowired
+    private BusinessDocumentOrderAdjustDetailMapper adjustDetailMapper;
+
+    @Autowired
+    private ExecuteOrderMapper executeOrderMapper;
+
+    @Autowired
+    private BusinessDocumentCargoMultiMapper businessDocumentCargoMultiMapper;
+
+    @Autowired
+    private BusinessDocumentAddressMultiMapper businessDocumentAddressMultiMapper;
+
+    @Autowired
+    private WlhyServiceFeign wlhyServiceFeign;
+
+    /**
+     * 提交调整
+     * 返回 data = [是否需审核, 调整记录ID]
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult adjust(BusinessDocumentOrderAdjustDTO dto) {
+        if (dto == null || dto.getOrder() == null || dto.getOrder().getId() == null) {
+            throw new ServiceException("参数错误：缺少业务单ID(order.id)");
+        }
+        BusinessDocumentOrder dbOrder = businessDocumentOrderMapper.selectById(dto.getOrder().getId());
+        if (ObjectUtil.isNull(dbOrder)) {
+            throw new ServiceException("业务单不存在或已被删除");
+        }
+        BusinessDocumentOrder front = dto.getOrder();
+
+        // 1. 当前库中费用明细
+        List<BusinessOrderAccount> dbFeeList = businessOrderAccountMapper.selectList(
+                new LambdaQueryWrapper<BusinessOrderAccount>()
+                        .eq(BusinessOrderAccount::getOrderId, dbOrder.getId())
+                        .eq(BusinessOrderAccount::getIsDelete, 0));
+
+        // 2. 调整后的费用明细(前端)；为 null 则视为保持库中不变。
+        //    兼容前端两种传法：顶层 feeDetailList，或整单回传 order.businessOrderAccountList
+        List<BusinessOrderAccount> newFeeList = dto.getFeeDetailList();
+        if ((newFeeList == null || newFeeList.isEmpty()) && front.getBusinessOrderAccountList() != null) {
+            newFeeList = front.getBusinessOrderAccountList();
+        }
+
+        // 3. 生成"调整后"业务单对象：DB原值 + 前端可编辑字段覆盖(忽略null)
+        BusinessDocumentOrder afterOrder = buildAfterOrder(dbOrder, front);
+
+        // 3.1 地址兼容：前端把地址放在 shipment/receipt 或 loadingAddressList/unloadAddressList，
+        //     映射到 loading*/unload* 扁平字段(与下单主流程 BusinessDocumentOrderDomainService 一致口径)
+        applyAddressMapping(afterOrder, front);
+
+        // 4. 若提供了费用明细，则 deliveryFreight(合计)=明细 amount 之和，并联动到 afterOrder
+        boolean hasFeeDetail = newFeeList != null && !newFeeList.isEmpty();
+        if (hasFeeDetail) {
+            BigDecimal sum = sumAmount(newFeeList);
+            afterOrder.setDeliveryFreight(sum);
+        }
+
+        // 5. 判定是否修改了金额：以后端兜底比对为准，避免前端误传 false 绕过审核；
+        //    前端传 true 也尊重；后端比对结果与前端 OR 运算（任一为真则需审核）。
+        boolean backendChanged = isAmountChanged(dbOrder, front, hasFeeDetail, dbFeeList, newFeeList);
+        boolean amountChanged = backendChanged || Boolean.TRUE.equals(dto.getAmountChanged());
+
+        // 6. 写主记录
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Date now = new Date();
+        BusinessDocumentOrderAdjust adjust = buildAdjust(dbOrder, loginUser, now, amountChanged, dto.getAdjustReason());
+        adjustMapper.insert(adjust);
+
+        // 7. 写明细快照(调整后业务单整行 + 费用明细JSON)
+        BusinessDocumentOrderAdjustDetail detail = new BusinessDocumentOrderAdjustDetail();
+        copySnapshot(afterOrder, detail);
+        if (hasFeeDetail) {
+            detail.setFeeDetailJson(JSONUtil.toJsonStr(newFeeList));
+        }
+        detail.setAdjustId(adjust.getId());
+        detail.setOrderId(dbOrder.getId());
+        detail.setGoodsNumber(dbOrder.getGoodsNumber());
+        detail.setCreateBy(adjust.getAdjustBy());
+        detail.setCreateName(adjust.getAdjustByName());
+        detail.setCreateTime(now);
+        detail.setDelFlag(1);
+        adjustDetailMapper.insert(detail);
+
+        if (!amountChanged) {
+            // 8a. 直通：覆盖主表可编辑字段(含 deliveryFreight 合计) + 替换费用明细；不改动任何审核/执行状态
+            saveOrderAndFee(dbOrder.getId(), afterOrder, hasFeeDetail ? newFeeList : dbFeeList, loginUser, now, false, null);
+            updateAdjustPass(adjust.getId(), adjust.getAdjustBy(), adjust.getAdjustByName(), now, null);
+            syncTmsAsync(dbOrder.getGoodsNumber(), afterOrder);
+        } else {
+            // 8b. 涉及金额：仅把业务单 review_status 置为"调整待审核(3)"，其余状态(exec/orderStatus)不动，不更新业务单数据
+            BusinessDocumentOrder statusOnly = new BusinessDocumentOrder();
+            statusOnly.setId(dbOrder.getId());
+            statusOnly.setReviewStatus(REVIEW_ADJUST_WAIT); // 调整待审核
+            businessDocumentOrderMapper.updateById(statusOnly);
+        }
+
+        return AjaxResult.success(new Object[]{amountChanged, adjust.getId()});
+    }
+
+    /**
+     * 调整记录列表(管理页：查全部，可选按订单/业务单号/审核状态等筛选，配合分页使用)
+     */
+    public List<BusinessDocumentOrderAdjustRecordDTO> listAdjustRecord(BusinessDocumentOrderAdjustQueryDTO query) {
+        LambdaQueryWrapper<BusinessDocumentOrderAdjust> wrapper = new LambdaQueryWrapper<BusinessDocumentOrderAdjust>()
+                .eq(BusinessDocumentOrderAdjust::getDelFlag, 1);
+
+        // ===== 组织隔离(参考业务单 queryList 口径) =====
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null && loginUser.getUserPo() != null) {
+            Long loginOrgId = loginUser.getUserPo().getOrganizationId();
+            Long loginTopOrgId = loginUser.getUserPo().getTopOrganizationId();
+            // 一级组织非1(集团)时，按一级组织过滤(可看本一级组织下所有)
+            if (loginTopOrgId != null && loginTopOrgId != 1) {
+                wrapper.eq(BusinessDocumentOrderAdjust::getTopOrgId, String.valueOf(loginTopOrgId));
+            } else if (loginOrgId != null) {
+                // 否则按当前组织过滤；若查询方显式指定了 organizationId 则以其为准
+                Long effOrgId = (query != null && query.getOrganizationId() != null)
+                        ? query.getOrganizationId() : loginOrgId;
+                if (effOrgId != null) {
+                    wrapper.eq(BusinessDocumentOrderAdjust::getOrgId, String.valueOf(effOrgId));
+                }
+            }
+        } else if (query != null && query.getOrganizationId() != null) {
+            wrapper.eq(BusinessDocumentOrderAdjust::getOrgId, String.valueOf(query.getOrganizationId()));
+        }
+
+        if (query != null) {
+            if (query.getOrderId() != null) {
+                wrapper.eq(BusinessDocumentOrderAdjust::getOrderId, query.getOrderId());
+            }
+            if (StrUtil.isNotBlank(query.getGoodsNumber())) {
+                wrapper.like(BusinessDocumentOrderAdjust::getGoodsNumber, query.getGoodsNumber());
+            }
+            if (query.getIsAudit() != null) {
+                wrapper.eq(BusinessDocumentOrderAdjust::getIsAudit, query.getIsAudit());
+            }
+            if (query.getAuditStatus() != null) {
+                wrapper.eq(BusinessDocumentOrderAdjust::getAuditStatus, query.getAuditStatus());
+            }
+            if (StrUtil.isNotBlank(query.getAdjustByName())) {
+                wrapper.like(BusinessDocumentOrderAdjust::getAdjustByName, query.getAdjustByName());
+            }
+        }
+        wrapper.orderByDesc(BusinessDocumentOrderAdjust::getAdjustTime);
+        List<BusinessDocumentOrderAdjust> list = adjustMapper.selectList(wrapper);
+        return list.stream().map(a -> {
+            BusinessDocumentOrderAdjustRecordDTO vo = new BusinessDocumentOrderAdjustRecordDTO();
+            BeanUtil.copyProperties(a, vo);
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * 按业务单查询调整记录(供订单详情页"调整记录"Tab用)
+     * 每条记录同时带出调整后明细快照(detail)，前端可自包含展示，无需再单独调详情接口
+     */
+    public List<BusinessDocumentOrderAdjustRecordDTO> listAdjustRecordByOrder(Long orderId) {
+        BusinessDocumentOrderAdjustQueryDTO query = new BusinessDocumentOrderAdjustQueryDTO();
+        query.setOrderId(orderId);
+        List<BusinessDocumentOrderAdjustRecordDTO> list = listAdjustRecord(query);
+        if (list == null || list.isEmpty()) {
+            return list;
+        }
+        // 批量取明细快照按 adjust_id 一次性拼上，避免 N+1
+        List<Long> adjustIds = list.stream()
+                .map(BusinessDocumentOrderAdjustRecordDTO::getId)
+                .collect(Collectors.toList());
+        List<BusinessDocumentOrderAdjustDetail> details = adjustDetailMapper.selectList(
+                new LambdaQueryWrapper<BusinessDocumentOrderAdjustDetail>()
+                        .in(BusinessDocumentOrderAdjustDetail::getAdjustId, adjustIds)
+                        .eq(BusinessDocumentOrderAdjustDetail::getDelFlag, 1));
+        Map<Long, BusinessDocumentOrderAdjustDetail> detailMap = details.stream()
+                .collect(Collectors.toMap(BusinessDocumentOrderAdjustDetail::getAdjustId, d -> d, (a, b) -> a));
+        list.forEach(vo -> vo.setDetail(detailMap.get(vo.getId())));
+        return list;
+    }
+
+    /**
+     * 调整记录详情(主记录 + 调整后明细快照)
+     */
+    public BusinessDocumentOrderAdjustRecordDTO getAdjustRecord(Long adjustId) {
+        BusinessDocumentOrderAdjust adjust = adjustMapper.selectById(adjustId);
+        if (adjust == null) {
+            throw new ServiceException("调整记录不存在");
+        }
+        BusinessDocumentOrderAdjustRecordDTO vo = new BusinessDocumentOrderAdjustRecordDTO();
+        BeanUtil.copyProperties(adjust, vo);
+        BusinessDocumentOrderAdjustDetail detail = adjustDetailMapper.selectOne(
+                new LambdaQueryWrapper<BusinessDocumentOrderAdjustDetail>()
+                        .eq(BusinessDocumentOrderAdjustDetail::getAdjustId, adjustId)
+                        .eq(BusinessDocumentOrderAdjustDetail::getDelFlag, 1)
+                        .last("LIMIT 1"));
+        vo.setDetail(detail);
+        return vo;
+    }
+
+    /**
+     * 调整审核(通过/驳回)，业务主管操作
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult auditAdjust(BusinessDocumentOrderAdjustAuditDTO auditDTO) {
+        if (auditDTO == null || auditDTO.getAdjustId() == null) {
+            throw new ServiceException("参数错误：缺少调整记录ID");
+        }
+        BusinessDocumentOrderAdjust adjust = adjustMapper.selectById(auditDTO.getAdjustId());
+        if (adjust == null) {
+            throw new ServiceException("调整记录不存在");
+        }
+        if (adjust.getAuditStatus() == null || adjust.getAuditStatus() != AUDIT_WAIT) {
+            throw new ServiceException("该调整记录非待审核状态，无法审核");
+        }
+        Integer result = auditDTO.getAuditResult();
+        if (result == null || (result != AUDIT_PASS && result != AUDIT_REJECT)) {
+            throw new ServiceException("审核结果非法");
+        }
+
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String auditBy = loginUser != null ? String.valueOf(loginUser.getUserid()) : null;
+        String auditByName = loginUser != null && loginUser.getWlhyLoginUser() != null ? loginUser.getWlhyLoginUser().getRealname() : null;
+        Date now = new Date();
+
+        if (result == AUDIT_PASS) {
+            BusinessDocumentOrder order = businessDocumentOrderMapper.selectById(adjust.getOrderId());
+            if (ObjectUtil.isNull(order)) {
+                throw new ServiceException("业务单不存在");
+            }
+            BusinessDocumentOrderAdjustDetail detail = adjustDetailMapper.selectOne(
+                    new LambdaQueryWrapper<BusinessDocumentOrderAdjustDetail>()
+                            .eq(BusinessDocumentOrderAdjustDetail::getAdjustId, adjust.getId())
+                            .eq(BusinessDocumentOrderAdjustDetail::getDelFlag, 1)
+                            .last("LIMIT 1"));
+
+            // 还原调整后业务单(从JSON整行快照)
+            BusinessDocumentOrder snapshot = null;
+            if (detail != null && StrUtil.isNotBlank(detail.getOrderSnapshotJson())) {
+                try {
+                    snapshot = JSONUtil.toBean(detail.getOrderSnapshotJson(), BusinessDocumentOrder.class);
+                } catch (Exception e) {
+                    log.warn("解析调整快照JSON失败", e);
+                }
+            }
+            BusinessDocumentOrder toSave = new BusinessDocumentOrder();
+            toSave.setId(order.getId());
+            if (snapshot != null) {
+                BeanUtil.copyProperties(snapshot, toSave, CopyOptions.create().setIgnoreNullValue(true)
+                        .setIgnoreProperties(toArray()));
+            } else if (detail != null) {
+                BeanUtil.copyProperties(detail, toSave, CopyOptions.create().setIgnoreNullValue(true)
+                        .setIgnoreProperties(toArray()));
+            }
+
+            // 还原调整后费用明细(从 feeDetailJson)
+            List<BusinessOrderAccount> newFeeList = new ArrayList<>();
+            if (detail != null && StrUtil.isNotBlank(detail.getFeeDetailJson())) {
+                try {
+                    newFeeList = JSONUtil.toList(detail.getFeeDetailJson(), BusinessOrderAccount.class);
+                } catch (Exception e) {
+                    log.warn("解析调整费用明细JSON失败", e);
+                }
+            }
+            // 若快照中有明细合计则保证 deliveryFreight 一致
+            if (!newFeeList.isEmpty()) {
+                toSave.setDeliveryFreight(sumAmount(newFeeList));
+            }
+            // 审核通过后 review_status 一律置为 1(已审核)；不影响 order_status / execute_status
+            toSave.setReviewStatus(1L);
+            // 覆盖业务单 + 替换费用明细
+            saveOrderAndFee(order.getId(), toSave, newFeeList, loginUser, now, false, null);
+
+            updateAdjustPass(adjust.getId(), auditBy, auditByName, now, auditDTO.getAuditRemark());
+            syncTmsAsync(order.getGoodsNumber(), toSave);
+        } else {
+            adjust.setAuditStatus(AUDIT_REJECT);
+            adjust.setIsAudit(1); // 走到审核即说明该调整需要审核，保持 is_audit 与 audit_status 语义一致
+            adjust.setAuditBy(auditBy);
+            adjust.setAuditByName(auditByName);
+            adjust.setAuditTime(now);
+            adjust.setAuditRemark(auditDTO.getAuditRemark());
+            adjust.setUpdateBy(auditBy);
+            adjust.setUpdateTime(now);
+            adjustMapper.updateById(adjust);
+
+            // 驳回：不更新业务单数据，仅把 review_status 置为「调整驳回(4)」；
+            // 不影响 order_status / execute_status 等其它单据状态；可再次调整提交审核
+            BusinessDocumentOrder statusOnly = new BusinessDocumentOrder();
+            statusOnly.setId(adjust.getOrderId());
+            statusOnly.setReviewStatus(REVIEW_ADJUST_REJECT);
+            businessDocumentOrderMapper.updateById(statusOnly);
+        }
+        return AjaxResult.success();
+    }
+
+    // =====================================================
+    //  私有工具
+    // =====================================================
+
+    private BusinessDocumentOrder buildAfterOrder(BusinessDocumentOrder dbOrder, BusinessDocumentOrder front) {
+        BusinessDocumentOrder after = new BusinessDocumentOrder();
+        BeanUtil.copyProperties(dbOrder, after, CopyOptions.create().setIgnoreNullValue(true));
+        BeanUtil.copyProperties(front, after, CopyOptions.create().setIgnoreNullValue(true)
+                .setIgnoreProperties(toArray()));
+        after.setId(dbOrder.getId());
+        return after;
+    }
+
+    /**
+     * 地址兼容映射：前端整单回传时地址在 shipment/receipt 或 loadingAddressList/unloadAddressList，
+     * 这里统一映射到 business_document_order 的 loading 与 unload 系列扁平字段。
+     * 口径与 BusinessDocumentOrderDomainService 下单主流程保持一致：
+     *  装货取第一条地址，卸货取最后一条地址。
+     */
+    private void applyAddressMapping(BusinessDocumentOrder after, BusinessDocumentOrder front) {
+        BusinessDocumentAddressMultiDTO loading = null;
+        BusinessDocumentAddressMultiDTO unloading = null;
+
+        // 优先取 shipment/receipt 单对象，其次取 loadingAddressList/unloadAddressList 集合
+        if (front.getShipment() != null) {
+            loading = front.getShipment();
+        } else if (front.getLoadingAddressList() != null && !front.getLoadingAddressList().isEmpty()) {
+            loading = front.getLoadingAddressList().get(0);
+        }
+        if (front.getReceipt() != null) {
+            unloading = front.getReceipt();
+        } else if (front.getUnloadAddressList() != null && !front.getUnloadAddressList().isEmpty()) {
+            unloading = front.getUnloadAddressList().get(front.getUnloadAddressList().size() - 1);
+        }
+
+        if (loading != null) {
+            after.setLoadingAreaId(loading.getAreaCode());
+            after.setLoadingName(loading.getAreaName() != null ? loading.getAreaName() : loading.getAreaCode());
+            after.setLoadingAddress(loading.getAddress());
+            after.setLoadingLongitude(loading.getLongitude());
+            after.setLoadingLatitude(loading.getLatitude());
+            after.setFreighterName(loading.getContactName());
+            after.setLoadingPhone(loading.getContactPhone());
+            after.setLoadingDate(loading.getLayDate());
+        }
+        if (unloading != null) {
+            after.setUnloadAreaId(unloading.getAreaCode());
+            after.setUnloadName(unloading.getAreaName() != null ? unloading.getAreaName() : unloading.getAreaCode());
+            after.setUnloadAddress(unloading.getAddress());
+            after.setUnloadLongitude(unloading.getLongitude());
+            after.setUnloadLatitude(unloading.getLatitude());
+            after.setDischargerName(unloading.getContactName());
+            after.setUnloadPhone(unloading.getContactPhone());
+            after.setUnloadingData(unloading.getLayDate());
+        }
+    }
+
+    private BusinessDocumentOrderAdjust buildAdjust(BusinessDocumentOrder dbOrder, LoginUser u, Date now,
+                                                     boolean amountChanged, String reason) {
+        BusinessDocumentOrderAdjust adjust = new BusinessDocumentOrderAdjust();
+        adjust.setOrderId(dbOrder.getId());
+        adjust.setGoodsNumber(dbOrder.getGoodsNumber());
+        adjust.setAdjustBy(u != null ? String.valueOf(u.getUserid()) : null);
+        adjust.setAdjustByName(u != null && u.getWlhyLoginUser() != null ? u.getWlhyLoginUser().getRealname() : null);
+        adjust.setAdjustTime(now);
+        adjust.setAdjustReason(reason);
+        adjust.setIsAudit(amountChanged ? 1 : 0);
+        adjust.setAuditStatus(amountChanged ? AUDIT_WAIT : AUDIT_PASS);
+        adjust.setBeforeReviewStatus(dbOrder.getReviewStatus());
+        // 组织信息：参考业务单口径，取当前登录用户所属组织(调整人归属)
+        if (u != null && u.getUserPo() != null) {
+            if (u.getUserPo().getOrganizationId() != null) {
+                adjust.setOrgId(String.valueOf(u.getUserPo().getOrganizationId()));
+            } else {
+                adjust.setOrgId(dbOrder.getOrgId());
+            }
+            if (u.getUserPo().getTopOrganizationId() != null) {
+                adjust.setTopOrgId(String.valueOf(u.getUserPo().getTopOrganizationId()));
+            } else if (dbOrder.getTopOrganizationId() != null) {
+                adjust.setTopOrgId(String.valueOf(dbOrder.getTopOrganizationId()));
+            }
+        } else {
+            adjust.setOrgId(dbOrder.getOrgId());
+            if (dbOrder.getTopOrganizationId() != null) {
+                adjust.setTopOrgId(String.valueOf(dbOrder.getTopOrganizationId()));
+            }
+        }
+        adjust.setCreateBy(adjust.getAdjustBy());
+        adjust.setCreateName(adjust.getAdjustByName());
+        adjust.setCreateTime(now);
+        adjust.setDelFlag(1);
+        return adjust;
+    }
+
+    /**
+     * 是否修改了金额：主表金额/费用列变化 或 明细 amount 变化
+     */
+    private boolean isAmountChanged(BusinessDocumentOrder dbOrder, BusinessDocumentOrder front,
+                                    boolean hasFeeDetail, List<BusinessOrderAccount> dbFeeList,
+                                    List<BusinessOrderAccount> newFeeList) {
+        // a) 主表金额/费用列比对（金额列用 BigDecimal 比对，字符串列用 equals 比对）
+        boolean mainChanged = FEE_FIELDS.stream().anyMatch(field -> {
+            Object newVal = BeanUtil.getFieldValue(front, field);
+            if (newVal == null) {
+                return false;
+            }
+            Object oldVal = BeanUtil.getFieldValue(dbOrder, field);
+            if (newVal instanceof BigDecimal || oldVal instanceof BigDecimal) {
+                BigDecimal old = oldVal == null ? BigDecimal.ZERO : new BigDecimal(oldVal.toString());
+                BigDecimal now = new BigDecimal(newVal.toString());
+                return old.compareTo(now) != 0;
+            }
+            // 字符串字段(结算币种/收款账户等)
+            return !newVal.toString().equals(oldVal == null ? "" : oldVal.toString());
+        });
+        if (mainChanged) {
+            return true;
+        }
+        // b) 若前端未传明细，则只看主表；若传了明细，比较明细金额
+        if (!hasFeeDetail) {
+            return false;
+        }
+        // 明细合计对比
+        BigDecimal oldSum = sumAmount(dbFeeList);
+        BigDecimal newSum = sumAmount(newFeeList);
+        return oldSum.compareTo(newSum) != 0;
+    }
+
+    private BigDecimal sumAmount(List<BusinessOrderAccount> list) {
+        BigDecimal sum = BigDecimal.ZERO;
+        if (list == null) {
+            return sum;
+        }
+        for (BusinessOrderAccount acc : list) {
+            if (acc.getAmount() != null) {
+                sum = sum.add(acc.getAmount());
+            }
+        }
+        return sum;
+    }
+
+    /**
+     * 覆盖业务单可编辑字段 + 替换费用明细(逻辑删旧 + 插新)
+     */
+    /**
+     * 覆盖业务单可编辑字段 + 替换费用明细(逻辑删旧 + 插新)
+     * @param restoreReview 是否还原审核状态(审核通过/驳回后 true；直通 false 不改任何审核状态)
+     * @param beforeReviewStatus 调整前 review_status，用于还原
+     */
+    private void saveOrderAndFee(Long orderId, BusinessDocumentOrder toSave,
+                                 List<BusinessOrderAccount> newFeeList,
+                                 LoginUser loginUser, Date now,
+                                 boolean restoreReview, Long beforeReviewStatus) {
+        if (restoreReview) {
+            // 仅还原 review_status 到调整前值；不影响 order_status / execute_status 等其它状态
+            toSave.setReviewStatus(beforeReviewStatus == null ? 0L : beforeReviewStatus);
+        }
+        businessDocumentOrderMapper.updateById(toSave);
+
+        // 逻辑删旧明细
+        List<BusinessOrderAccount> oldFeeList = businessOrderAccountMapper.selectList(
+                new LambdaQueryWrapper<BusinessOrderAccount>()
+                        .eq(BusinessOrderAccount::getOrderId, orderId)
+                        .eq(BusinessOrderAccount::getIsDelete, 0));
+        if (oldFeeList != null) {
+            for (BusinessOrderAccount oldAcc : oldFeeList) {
+                oldAcc.setIsDelete(1);
+                oldAcc.setUpdateBy(loginUser != null ? String.valueOf(loginUser.getUserid()) : null);
+                oldAcc.setUpdateTime(now);
+                businessOrderAccountMapper.updateById(oldAcc);
+            }
+        }
+        // 插新明细
+        if (newFeeList != null && !newFeeList.isEmpty()) {
+            for (BusinessOrderAccount acc : newFeeList) {
+                acc.setId(IdUtil.randomUUID());
+                acc.setOrderId(String.valueOf(orderId));
+                acc.setIsDelete(0);
+                acc.setCreateBy(loginUser != null ? String.valueOf(loginUser.getUserid()) : null);
+                acc.setCreateTime(now);
+                businessOrderAccountMapper.insert(acc);
+            }
+        }
+
+        // 同步地址明细表(business_document_address_multi)：逻辑删旧 + 按调整后扁平字段插新
+        syncAddressDetail(orderId, toSave, loginUser, now);
+    }
+
+    /**
+     * 同步地址明细表：把「调整后业务单」的装/卸货扁平字段写回 business_document_address_multi。
+     * 与 applyAddressMapping 口径一致(装货取第一条、卸货取最后一条)，此处各保留一条。
+     */
+    private void syncAddressDetail(Long orderId, BusinessDocumentOrder toSave, LoginUser loginUser, Date now) {
+        // 逻辑删旧
+        List<BusinessDocumentAddressMulti> oldList = businessDocumentAddressMultiMapper.selectList(
+                new LambdaQueryWrapper<BusinessDocumentAddressMulti>()
+                        .eq(BusinessDocumentAddressMulti::getOrderId, String.valueOf(orderId))
+                        .eq(BusinessDocumentAddressMulti::getDelFlag, 1));
+        if (oldList != null) {
+            for (BusinessDocumentAddressMulti old : oldList) {
+                old.setDelFlag(0);
+                old.setUpdateBy(loginUser != null ? loginUser.getUserid() : null);
+                old.setUpdateTime(now);
+                businessDocumentAddressMultiMapper.updateById(old);
+            }
+        }
+
+        Long userId = loginUser != null ? loginUser.getUserid() : null;
+        // 装货
+        BusinessDocumentAddressMulti loading = new BusinessDocumentAddressMulti();
+        loading.setOrderId(String.valueOf(orderId));
+        loading.setAreaCode(toSave.getLoadingAreaId());
+        loading.setAreaName(toSave.getLoadingName());
+        loading.setAddress(toSave.getLoadingAddress());
+        loading.setLongitude(toSave.getLoadingLongitude());
+        loading.setLatitude(toSave.getLoadingLatitude());
+        loading.setContactName(toSave.getFreighterName());
+        loading.setContactPhone(toSave.getLoadingPhone());
+        loading.setLayDate(toSave.getLoadingDate());
+        loading.setLayType(1L);
+        loading.setDelFlag(1);
+        loading.setOrganizationId(toSave.getOrganizationId());
+        loading.setOrganizationName(toSave.getOrganizationName());
+        loading.setTopOrganizationId(toSave.getTopOrganizationId());
+        loading.setCreateBy(userId);
+        loading.setCreateTime(now);
+        loading.setUpdateBy(userId);
+        loading.setUpdateTime(now);
+        businessDocumentAddressMultiMapper.insert(loading);
+
+        // 卸货
+        BusinessDocumentAddressMulti unload = new BusinessDocumentAddressMulti();
+        unload.setOrderId(String.valueOf(orderId));
+        unload.setAreaCode(toSave.getUnloadAreaId());
+        unload.setAreaName(toSave.getUnloadName());
+        unload.setAddress(toSave.getUnloadAddress());
+        unload.setLongitude(toSave.getUnloadLongitude());
+        unload.setLatitude(toSave.getUnloadLatitude());
+        unload.setContactName(toSave.getDischargerName());
+        unload.setContactPhone(toSave.getUnloadPhone());
+        unload.setLayDate(toSave.getUnloadingData());
+        unload.setLayType(2L);
+        unload.setDelFlag(1);
+        unload.setOrganizationId(toSave.getOrganizationId());
+        unload.setOrganizationName(toSave.getOrganizationName());
+        unload.setTopOrganizationId(toSave.getTopOrganizationId());
+        unload.setCreateBy(userId);
+        unload.setCreateTime(now);
+        unload.setUpdateBy(userId);
+        unload.setUpdateTime(now);
+        businessDocumentAddressMultiMapper.insert(unload);
+    }
+
+    private void copySnapshot(BusinessDocumentOrder order, BusinessDocumentOrderAdjustDetail detail) {
+        BeanUtil.copyProperties(order, detail, CopyOptions.create().setIgnoreNullValue(true)
+                .setIgnoreProperties("id", "adjustId", "orderId", "createBy", "createName",
+                        "createTime", "updateBy", "updateTime", "delFlag",
+                        "orderSnapshotJson", "feeDetailJson"));
+        try {
+            detail.setOrderSnapshotJson(JSONUtil.toJsonStr(order));
+        } catch (Exception e) {
+            log.warn("生成调整快照JSON失败", e);
+        }
+    }
+
+    private void updateAdjustPass(Long adjustId, String auditBy, String auditByName, Date auditTime, String remark) {
+        BusinessDocumentOrderAdjust adjust = new BusinessDocumentOrderAdjust();
+        adjust.setId(adjustId);
+        adjust.setAuditStatus(AUDIT_PASS);
+        adjust.setAuditBy(auditBy);
+        adjust.setAuditByName(auditByName);
+        adjust.setAuditTime(auditTime);
+        adjust.setAuditRemark(remark);
+        adjust.setUpdateBy(auditBy);
+        adjust.setUpdateTime(auditTime);
+        adjustMapper.updateById(adjust);
+    }
+
+    private String[] toArray() {
+        return PROTECTED_FIELDS.toArray(new String[0]);
+    }
+
+    private void syncTmsAsync(String goodsNumber, BusinessDocumentOrder after) {
+        try {
+            List<ExecuteOrder> executeOrders = executeOrderMapper.selectList(
+                    new LambdaQueryWrapper<ExecuteOrder>()
+                            .eq(ExecuteOrder::getGoodsNumber, goodsNumber)
+                            .eq(ExecuteOrder::getDelFlag, 1));
+            if (executeOrders == null || executeOrders.isEmpty()) {
+                return;
+            }
+            for (ExecuteOrder executeOrder : executeOrders) {
+                // 仅已下发 TMS(存在 TMS 单号)的执行单需要同步修改
+                if (StrUtil.isBlank(executeOrder.getTmsOrderNumber())) {
+                    continue;
+                }
+                syncTmsOrder(executeOrder, after);
+            }
+        } catch (Exception e) {
+            log.error("同步TMS失败，不影响主流程", e);
+        }
+    }
+
+    /**
+     * 同步修改单个 TMS 订单：按调整后业务单重新组装 TmsOrderAddDTO，
+     * 带 executeOrderNumber 定位 TMS 订单，调用 TMS /feign/order/update 接口。
+     */
+    private void syncTmsOrder(ExecuteOrder executeOrder, BusinessDocumentOrder after) {
+        TmsOrderAddDTO tmsOrderAddDTO = new TmsOrderAddDTO();
+        BeanUtil.copyProperties(after, tmsOrderAddDTO);
+        // id 传 OMS 业务单主键：TMS 侧用作 tms_order_account.order_id 口径；
+        // TMS 的 update 在覆盖前会保留 tms_order 真实主键，不会被污染
+        tmsOrderAddDTO.setId(String.valueOf(after.getId()));
+        // TMS 侧按执行单号定位订单
+        tmsOrderAddDTO.setExecuteOrderId(String.valueOf(executeOrder.getId()));
+        tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
+        tmsOrderAddDTO.setGoodsNumber(after.getGoodsNumber());
+        tmsOrderAddDTO.setOrderSource("0");
+
+        // TMS 侧 update 按 appointShipperId(业务单货主) 定位货主，需显式带上，口径与下单一致
+        if (StrUtil.isNotBlank(after.getAppointShipperId())) {
+            tmsOrderAddDTO.setAppointShipperId(after.getAppointShipperId());
+        }
+        if (after.getAppointShipper() != null) {
+            tmsOrderAddDTO.setAppointShipper(after.getAppointShipper());
+        }
+        if (after.getSzwlUserId() != null) {
+            tmsOrderAddDTO.setSzwlUserId(after.getSzwlUserId());
+        }
+
+        // 货物信息
+        List<BusinessDocumentCargoMulti> cargoList = businessDocumentCargoMultiMapper.selectList(
+                new LambdaQueryWrapper<BusinessDocumentCargoMulti>()
+                        .eq(BusinessDocumentCargoMulti::getOrderId, String.valueOf(after.getId()))
+                        .eq(BusinessDocumentCargoMulti::getDelFlag, 1));
+        List<TmsCargoInfoDTO> cargoInfoList = new ArrayList<>();
+        if (cargoList != null) {
+            for (BusinessDocumentCargoMulti cargo : cargoList) {
+                TmsCargoInfoDTO dto = new TmsCargoInfoDTO();
+                BeanUtil.copyProperties(cargo, dto);
+                cargoInfoList.add(dto);
+            }
+        }
+        tmsOrderAddDTO.setCargoInfoList(cargoInfoList);
+
+        // 装货地址：统一以「调整后业务单」的扁平字段为准，避免明细表(business_document_address_multi)旧值覆盖
+        TmsAddressMultiDTO loadingDto = new TmsAddressMultiDTO();
+        loadingDto.setAreaCode(after.getLoadingAreaId());
+        loadingDto.setAreaName(after.getLoadingName());
+        loadingDto.setAddress(after.getLoadingAddress());
+        loadingDto.setLongitude(after.getLoadingLongitude());
+        loadingDto.setLatitude(after.getLoadingLatitude());
+        loadingDto.setContactName(after.getFreighterName());
+        loadingDto.setContactPhone(after.getLoadingPhone());
+        loadingDto.setLayDate(after.getLoadingDate());
+        loadingDto.setLayType(1);
+        List<TmsAddressMultiDTO> loadingAddressList = new ArrayList<>();
+        loadingAddressList.add(loadingDto);
+        tmsOrderAddDTO.setLoadingAddressList(loadingAddressList);
+
+        // 卸货地址：同样以「调整后业务单」的扁平字段为准
+        TmsAddressMultiDTO unloadDto = new TmsAddressMultiDTO();
+        unloadDto.setAreaCode(after.getUnloadAreaId());
+        unloadDto.setAreaName(after.getUnloadName());
+        unloadDto.setAddress(after.getUnloadAddress());
+        unloadDto.setLongitude(after.getUnloadLongitude());
+        unloadDto.setLatitude(after.getUnloadLatitude());
+        unloadDto.setContactName(after.getDischargerName());
+        unloadDto.setContactPhone(after.getUnloadPhone());
+        unloadDto.setLayDate(after.getUnloadingData());
+        unloadDto.setLayType(2);
+        List<TmsAddressMultiDTO> unloadAddressList = new ArrayList<>();
+        unloadAddressList.add(unloadDto);
+        tmsOrderAddDTO.setUnloadAddressList(unloadAddressList);
+
+        // 费用明细
+        List<BusinessOrderAccount> accountList = businessOrderAccountMapper.selectList(
+                new LambdaQueryWrapper<BusinessOrderAccount>()
+                        .eq(BusinessOrderAccount::getOrderId, after.getId())
+                        .eq(BusinessOrderAccount::getIsDelete, 0));
+        List<TmsOrderAccount> tmsOrderAccountList = new ArrayList<>();
+        if (accountList != null) {
+            for (BusinessOrderAccount acc : accountList) {
+                TmsOrderAccount dto = new TmsOrderAccount();
+                BeanUtil.copyProperties(acc, dto);
+                tmsOrderAccountList.add(dto);
+            }
+        }
+        tmsOrderAddDTO.setTmsOrderAccountList(tmsOrderAccountList);
+
+        AjaxResult result = wlhyServiceFeign.update(tmsOrderAddDTO);
+        if (result != null && "200".equals(String.valueOf(result.get("code")))) {
+            log.info("调整后同步修改TMS订单成功，执行单[{}]，业务单[{}]", executeOrder.getGoodsNumber(), after.getGoodsNumber());
+        } else {
+            log.error("调整后同步修改TMS订单失败，执行单[{}]，返回: {}", executeOrder.getGoodsNumber(),
+                    result == null ? "null" : result.get("msg"));
+        }
+    }
+}

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/entity/BusinessDocumentOrder.java

@@ -8,6 +8,7 @@ import com.mhd.common.core.web.domain.BaseVOEntity;
 import java.math.BigDecimal;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -659,7 +660,7 @@ public class BusinessDocumentOrder extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Date documentDate;
 
-    @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回")
+    @ApiModelProperty( "审核状态 0-未审核 1-审核通过 2-已驳回 3-调整待审核 4-调整驳回")
     private Long reviewStatus;
 
     @ApiModelProperty("审核时间")
@@ -825,4 +826,35 @@ public class BusinessDocumentOrder extends BaseVOEntity{
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private String shuttleNo;
+
+    /**
+     * 前端整单回传时携带的费用明细(business_order_account)，非表字段，仅用于「订单调整」入参接收。
+     * 与顶层 feeDetailList 二选一，后端在 adjust() 中做回退兼容。
+     */
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private List<com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount> businessOrderAccountList;
+
+    /**
+     * 前端整单回传时的装货地址(单个)，非表字段，仅用于「订单调整」入参接收与映射到 loading* 扁平字段。
+     */
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO shipment;
+
+    /**
+     * 前端整单回传时的卸货地址(单个)，非表字段，仅用于「订单调整」入参接收与映射到 unload* 扁平字段。
+     */
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO receipt;
+
+    /**
+     * 前端整单回传时的装货地址集合，非表字段，仅用于「订单调整」入参接收与映射。
+     */
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private List<com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO> loadingAddressList;
+
+    /**
+     * 前端整单回传时的卸货地址集合，非表字段，仅用于「订单调整」入参接收与映射。
+     */
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private List<com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO> unloadAddressList;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrderAdjust/entity/BusinessDocumentOrderAdjust.java

@@ -0,0 +1,103 @@
+package com.mhd.oms.domain.businessDocumentOrderAdjust.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 运输业务单 调整主记录
+ *
+ * @author dev
+ * @date 2026-09-09
+ */
+@Data
+@TableName("business_document_order_adjust")
+public class BusinessDocumentOrderAdjust implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @ApiModelProperty("业务单ID")
+    private Long orderId;
+
+    @ApiModelProperty("业务单号")
+    private String goodsNumber;
+
+    @ApiModelProperty("调整人账号")
+    private String adjustBy;
+
+    @ApiModelProperty("调整人姓名")
+    private String adjustByName;
+
+    @ApiModelProperty("调整时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date adjustTime;
+
+    @ApiModelProperty("调整原因")
+    private String adjustReason;
+
+    @ApiModelProperty("是否需要审核 0-否 1-是")
+    private Integer isAudit;
+
+    @ApiModelProperty("调整前业务单审核状态(review_status原值，用于调整审核通过/驳回后还原，避免影响其它)")
+    private Long beforeReviewStatus;
+
+    @ApiModelProperty("审核状态 0-待审核 1-审核通过 2-驳回")
+    private Integer auditStatus;
+
+    @ApiModelProperty("审核人账号")
+    private String auditBy;
+
+    @ApiModelProperty("审核人姓名")
+    private String auditByName;
+
+    @ApiModelProperty("审核时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
+
+    @ApiModelProperty("审核/驳回意见")
+    private String auditRemark;
+
+    @ApiModelProperty("组织ID")
+    private String orgId;
+
+    @ApiModelProperty("一级组织ID")
+    private String topOrgId;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建人姓名")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新人姓名")
+    private String updateName;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("删除标记 1-正常 0-删除")
+    private Integer delFlag;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrderAdjust/repository/mapper/BusinessDocumentOrderAdjustMapper.java

@@ -0,0 +1,12 @@
+package com.mhd.oms.domain.businessDocumentOrderAdjust.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.oms.domain.businessDocumentOrderAdjust.entity.BusinessDocumentOrderAdjust;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 运输业务单 调整主记录 Mapper
+ */
+@Mapper
+public interface BusinessDocumentOrderAdjustMapper extends BaseMapper<BusinessDocumentOrderAdjust> {
+}

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrderAdjustDetail/entity/BusinessDocumentOrderAdjustDetail.java

@@ -0,0 +1,189 @@
+package com.mhd.oms.domain.businessDocumentOrderAdjustDetail.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 运输业务单 调整明细(调整后业务单整行快照)
+ *
+ * @author dev
+ * @date 2026-09-09
+ */
+@Data
+@TableName("business_document_order_adjust_detail")
+public class BusinessDocumentOrderAdjustDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty("关联调整主记录ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long adjustId;
+
+    @ApiModelProperty("业务单ID")
+    private Long orderId;
+
+    @ApiModelProperty("业务单号")
+    private String goodsNumber;
+
+    @ApiModelProperty("货物类型ID")
+    private String goodsTypeId;
+
+    @ApiModelProperty("货物名称")
+    private String goodsName;
+
+    @ApiModelProperty("车型")
+    private String carType;
+
+    @ApiModelProperty("装货地")
+    private String loadingName;
+
+    @ApiModelProperty("装货地址")
+    private String loadingAddress;
+
+    @ApiModelProperty("装货时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date loadingDate;
+
+    @ApiModelProperty("卸货地")
+    private String unloadName;
+
+    @ApiModelProperty("卸货地址")
+    private String unloadAddress;
+
+    @ApiModelProperty("卸货时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date unloadingData;
+
+    @ApiModelProperty("发货人")
+    private String freighterName;
+
+    @ApiModelProperty("装货电话")
+    private String loadingPhone;
+
+    @ApiModelProperty("收货人")
+    private String dischargerName;
+
+    @ApiModelProperty("卸货电话")
+    private String unloadPhone;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("线路")
+    private String route;
+
+    @ApiModelProperty("单据日期")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date documentDate;
+
+    @ApiModelProperty("组织ID")
+    private String orgId;
+
+    @ApiModelProperty("组织ID")
+    private Long organizationId;
+
+    @ApiModelProperty("组织名称")
+    private String organizationName;
+
+    @ApiModelProperty("一级组织ID")
+    private Long topOrganizationId;
+
+    // ==================== 金额/费用快照 ====================
+    @ApiModelProperty("发货运费")
+    private BigDecimal deliveryFreight;
+
+    @ApiModelProperty("已收运费")
+    private BigDecimal collectedFreight;
+
+    @ApiModelProperty("未收运费")
+    private BigDecimal uncollectedFreight;
+
+    @ApiModelProperty("少收运费")
+    private BigDecimal collectLessFreight;
+
+    @ApiModelProperty("运费单价(元/吨)")
+    private BigDecimal transportationUnitPrice;
+
+    @ApiModelProperty("信息费")
+    private BigDecimal infoFee;
+
+    @ApiModelProperty("计费单价")
+    private BigDecimal freightUnitPrice;
+
+    @ApiModelProperty("货物保险金额")
+    private BigDecimal cargoInsuranceAmount;
+
+    @ApiModelProperty("运费")
+    private BigDecimal freightCharges;
+
+    @ApiModelProperty("运费")
+    private BigDecimal freightFee;
+
+    @ApiModelProperty("卸货费")
+    private BigDecimal unloadingFee;
+
+    @ApiModelProperty("报关费")
+    private BigDecimal customsFee;
+
+    @ApiModelProperty("差货费")
+    private BigDecimal shortageFee;
+
+    @ApiModelProperty("杂费")
+    private BigDecimal miscellaneousFee;
+
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherFee;
+
+    @ApiModelProperty("滞车费")
+    private BigDecimal detentionFee;
+
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+
+    @ApiModelProperty("创建人")
+    private String createBy;
+
+    @ApiModelProperty("创建人姓名")
+    private String createName;
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @ApiModelProperty("删除标记 1-正常 0-删除")
+    private Integer delFlag;
+
+    @ApiModelProperty("调整后业务单整行JSON快照(用于全字段精确还原)")
+    private String orderSnapshotJson;
+
+    @ApiModelProperty("调整后费用明细JSON快照(business_order_account列表)")
+    private String feeDetailJson;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrderAdjustDetail/repository/mapper/BusinessDocumentOrderAdjustDetailMapper.java

@@ -0,0 +1,12 @@
+package com.mhd.oms.domain.businessDocumentOrderAdjustDetail.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mhd.oms.domain.businessDocumentOrderAdjustDetail.entity.BusinessDocumentOrderAdjustDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 运输业务单 调整明细 Mapper
+ */
+@Mapper
+public interface BusinessDocumentOrderAdjustDetailMapper extends BaseMapper<BusinessDocumentOrderAdjustDetail> {
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOrder/service/OmsAddressMultiService.java

@@ -610,6 +610,12 @@ public class OmsAddressMultiService  implements IOmsAddressMultiService {
             List<OmsOrderAccount> tmsOrderAccountList = tmsOrderAddDTO.getTmsOrderAccountList();
             if (ObjectUtil.isNotNull(tmsOrderAccountList) && tmsOrderAccountList.size() > 0) {
                 for (OmsOrderAccount tmsOrderAccount : tmsOrderAccountList) {
+                    // 防御：account_id 为空或<=0 时跳过（避免唯一约束撞库 + 插入脏数据）
+                    if (tmsOrderAccount.getAccountId() == null || tmsOrderAccount.getAccountId() <= 0) {
+                        log.warn("订单费用科目 accountId 为空，已跳过该条, orderId={}, subjectName={}",
+                                resevationOrder.getId(), tmsOrderAccount.getSubjectName());
+                        continue;
+                    }
                     tmsOrderAccount.setIsDelete(0);
                     tmsOrderAccount.setOrderId(String.valueOf(resevationOrder.getId()));
                     tmsOrderAccount.setCreateBy(String.valueOf(userPo.getUserId()));
@@ -1116,14 +1122,20 @@ public class OmsAddressMultiService  implements IOmsAddressMultiService {
         if (ObjectUtil.isNotNull(tmsOrderAccountList) && tmsOrderAccountList.size() > 0) {
             // 先删除旧的费用科目信息
             tmsOrderAccountMapper.delete(new LambdaQueryWrapper<OmsOrderAccount>().eq(OmsOrderAccount::getOrderId, String.valueOf(resevationOrder.getId())));
-            
+
             // 插入新的费用科目信息
             for (OmsOrderAccount tmsOrderAccount : tmsOrderAccountList) {
+                // 防御：account_id 为空或<=0 时跳过
+                if (tmsOrderAccount.getAccountId() == null || tmsOrderAccount.getAccountId() <= 0) {
+                    log.warn("订单费用科目 accountId 为空，已跳过该条, orderId={}, subjectName={}",
+                            resevationOrder.getId(), tmsOrderAccount.getSubjectName());
+                    continue;
+                }
                 tmsOrderAccount.setIsDelete(0);
                 tmsOrderAccount.setOrderId(String.valueOf(resevationOrder.getId()));
                 tmsOrderAccount.setCreateBy(String.valueOf(userPo.getUserId()));
                 tmsOrderAccount.setCreateTime(new Date());
-                
+
                 // 设置组织信息
                 if (tmsOrderAddDTO.getOrganizationId() != null) {
                     tmsOrderAccount.setOrganizationId(tmsOrderAddDTO.getOrganizationId());
@@ -1134,7 +1146,7 @@ public class OmsAddressMultiService  implements IOmsAddressMultiService {
                 if (tmsOrderAddDTO.getTopOrganizationId() != null) {
                     tmsOrderAccount.setTopOrganizationId(tmsOrderAddDTO.getTopOrganizationId());
                 }
-                
+
                 tmsOrderAccountMapper.insert(tmsOrderAccount);
             }
         }

mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java

@@ -22,6 +22,7 @@ import java.util.Map;
 /**
  * 三方服务 Feign
  */
+// 目标地址由 nacos 配置项 feign.url.mhd-third-party-service 指定，未配置时按服务名走服务发现
 @FeignClient(contextId = "thirdPartyServiceFeign",url = "http://10.33.0.129:8012",  value = ServiceNameConstants.THIRDPARTY_CENTER, configuration = FeignAutoConfiguration.class)
 public interface ThirdPartyServiceFeign {
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrderAdjust/BusinessDocumentOrderAdjustAuditDTO.java

@@ -0,0 +1,24 @@
+package com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 运输业务单 调整 审核入参
+ */
+@Data
+public class BusinessDocumentOrderAdjustAuditDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("调整记录ID(必传)")
+    private Long adjustId;
+
+    @ApiModelProperty("审核结果 1-通过 2-驳回")
+    private Integer auditResult;
+
+    @ApiModelProperty("审核/驳回意见")
+    private String auditRemark;
+}

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrderAdjust/BusinessDocumentOrderAdjustDTO.java

@@ -0,0 +1,37 @@
+package com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust;
+
+import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
+import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 运输业务单 调整提交入参
+ *
+ * 前端整单回传 business_document_order 全部字段 + 费用明细 business_order_account：
+ *  - amountChanged=true  (本次修改了金额) -> 需要业务主管审核
+ *  - amountChanged=false (仅改其它字段)   -> 无需审核，直接更新
+ *
+ * order: 前端把「调整后」业务单整单字段回传（含 id 定位；deliveryFreight 合计可由后端按明细自动算）。
+ * feeDetailList: 调整后费用明细（business_order_account），其 amount 之和 = 主表 deliveryFreight。
+ */
+@Data
+public class BusinessDocumentOrderAdjustDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("调整后业务单(整单字段,含 id 定位;金额合计 deliveryFreight 可由后端按明细自动算)")
+    private BusinessDocumentOrder order;
+
+    @ApiModelProperty("调整后费用明细(business_order_account)，amount 之和作为主表 deliveryFreight 合计")
+    private List<BusinessOrderAccount> feeDetailList;
+
+    @ApiModelProperty("是否修改了金额(前端判定传入)：true-需审核，false-直通")
+    private Boolean amountChanged;
+
+    @ApiModelProperty("调整原因")
+    private String adjustReason;
+}

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrderAdjust/BusinessDocumentOrderAdjustQueryDTO.java

@@ -0,0 +1,36 @@
+package com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 运输业务单 调整记录 查询条件(管理列表用，可不按订单、查全部)
+ */
+@Data
+public class BusinessDocumentOrderAdjustQueryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("业务单号(模糊)")
+    private String goodsNumber;
+
+    @ApiModelProperty("业务单ID")
+    private Long orderId;
+
+    @ApiModelProperty("是否需要审核 0-否 1-是")
+    private Integer isAudit;
+
+    @ApiModelProperty("审核状态 0-待审核 1-审核通过 2-驳回")
+    private Integer auditStatus;
+
+    @ApiModelProperty("调整人姓名(模糊)")
+    private String adjustByName;
+
+    @ApiModelProperty("所属组织ID(调整人/业务单所属组织)")
+    private Long organizationId;
+
+    @ApiModelProperty("一级组织ID(组织隔离用)")
+    private Long topOrganizationId;
+}

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrderAdjust/BusinessDocumentOrderAdjustRecordDTO.java

@@ -0,0 +1,68 @@
+package com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.mhd.oms.domain.businessDocumentOrderAdjustDetail.entity.BusinessDocumentOrderAdjustDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 运输业务单 调整记录(主记录) 列表/详情返回 VO
+ */
+@Data
+public class BusinessDocumentOrderAdjustRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主记录ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty("业务单ID")
+    private Long orderId;
+
+    @ApiModelProperty("业务单号")
+    private String goodsNumber;
+
+    @ApiModelProperty("调整人账号")
+    private String adjustBy;
+
+    @ApiModelProperty("调整人姓名")
+    private String adjustByName;
+
+    @ApiModelProperty("调整时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date adjustTime;
+
+    @ApiModelProperty("调整原因")
+    private String adjustReason;
+
+    @ApiModelProperty("是否需要审核 0-否 1-是")
+    private Integer isAudit;
+
+    @ApiModelProperty("审核状态 0-待审核 1-审核通过 2-驳回")
+    private Integer auditStatus;
+
+    @ApiModelProperty("审核人账号")
+    private String auditBy;
+
+    @ApiModelProperty("审核人姓名")
+    private String auditByName;
+
+    @ApiModelProperty("审核时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
+
+    @ApiModelProperty("审核/驳回意见")
+    private String auditRemark;
+
+    @ApiModelProperty("调整后整行快照明细(详情查询时带出)")
+    private BusinessDocumentOrderAdjustDetail detail;
+}

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java

@@ -10,7 +10,12 @@ import org.springframework.web.bind.annotation.*;
 import com.mhd.oms.interfaces.dto.businessDocumentOrder.BusinessDocumentOrderDTO;
 import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO;
 import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOrderPO;
+import com.mhd.oms.application.service.businessDocumentOrder.BusinessDocumentOrderAdjustService;
 import com.mhd.oms.application.service.businessDocumentOrder.BusinessDocumentOrderApplicationService;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustAuditDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustQueryDTO;
+import com.mhd.oms.interfaces.dto.businessDocumentOrderAdjust.BusinessDocumentOrderAdjustRecordDTO;
 import com.mhd.oms.interfaces.assembler.businessDocumentOrder.BusinessDocumentOrderAssembler;
 import com.github.pagehelper.PageHelper;
 import javax.annotation.Resource;
@@ -33,6 +38,9 @@ public class BusinessDocumentOrderApi extends BaseController{
     @Resource
     private BusinessDocumentOrderAssembler businessDocumentOrderAssembler;
 
+    @Resource
+    private BusinessDocumentOrderAdjustService businessDocumentOrderAdjustService;
+
     /**
      * 分页查询【业务单】列表
      */
@@ -161,7 +169,64 @@ public class BusinessDocumentOrderApi extends BaseController{
         }
     }
 
+    /**
+     * 订单调整 - 提交调整
+     * 若修改了金额字段则进入调整待审核，否则直通更新
+     */
+    @ApiOperation("订单调整 - 提交调整")
+    @PostMapping("/adjust")
+    public AjaxResult adjust(@RequestBody BusinessDocumentOrderAdjustDTO adjustDTO) {
+        try {
+            return businessDocumentOrderAdjustService.adjust(adjustDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+    }
 
+    /**
+     * 订单调整 - 调整记录列表(查全部，可分页/按业务单号或审核状态筛选)
+     */
+    @ApiOperation("订单调整 - 调整记录列表")
+    @GetMapping("/listAdjustRecord")
+    public TableDataInfo listAdjustRecord(BusinessDocumentOrderAdjustQueryDTO query,
+                                          @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+                                          @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<BusinessDocumentOrderAdjustRecordDTO> list = businessDocumentOrderAdjustService.listAdjustRecord(query);
+        return getDataTable(list);
+    }
 
+    /**
+     * 订单调整 - 按业务单查询调整记录(供订单详情页展示)
+     */
+    @ApiOperation("订单调整 - 按业务单查询调整记录")
+    @GetMapping("/listAdjustRecordByOrder/{orderId}")
+    public AjaxResult listAdjustRecordByOrder(@PathVariable("orderId") Long orderId) {
+        return AjaxResult.success(businessDocumentOrderAdjustService.listAdjustRecordByOrder(orderId));
+    }
+
+    /**
+     * 订单调整 - 调整记录详情
+     */
+    @ApiOperation("订单调整 - 调整记录详情")
+    @GetMapping("/getAdjustRecord/{adjustId}")
+    public AjaxResult getAdjustRecord(@PathVariable("adjustId") Long adjustId) {
+        return AjaxResult.success(businessDocumentOrderAdjustService.getAdjustRecord(adjustId));
+    }
+
+    /**
+     * 订单调整 - 审核(通过/驳回)
+     */
+    @ApiOperation("订单调整 - 审核")
+    @PostMapping("/auditAdjust")
+    public AjaxResult auditAdjust(@RequestBody BusinessDocumentOrderAdjustAuditDTO auditDTO) {
+        try {
+            return businessDocumentOrderAdjustService.auditAdjust(auditDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+    }
 
 }