Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

2026-09-16 17:14:24 +08:00
parent 4441aa12bf 6fbb9049bf
commit c7f7f943d2
45 changed files with 3786 additions and 77 deletions
@@ -22,6 +22,7 @@ import com.ruoyi.ar.domain.ArBillLog;
 import com.ruoyi.ar.domain.vo.ArBillActionRequest;
 import com.ruoyi.ar.domain.vo.ArBillGenerateQuery;
 import com.ruoyi.ar.domain.vo.ArBillGenerateRequest;
+import com.ruoyi.ar.domain.vo.ArBillQuery;
 import com.ruoyi.ar.service.IArBillService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -43,7 +44,7 @@ public class ArBillController extends BaseController

    @PreAuthorize("@ss.hasPermi('ar:bill:list')")
    @GetMapping("/list")
-    public TableDataInfo list(ArBill query)
+    public TableDataInfo list(ArBillQuery query)
    {
        startPage();
        List<ArBill> list = billService.selectArBillList(query);
@@ -0,0 +1,78 @@
+package com.ruoyi.web.controller.customer.customerinfo;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet;
+import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption;
+import com.ruoyi.customer.customerinfo.service.IBmsCustomerPriceSetService;
+
+/**
+ * 客户套餐绑定Controller（客户管理-客户编辑-绑定套餐）
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@RestController
+@RequestMapping("/customersupplier/customerinfo/priceset")
+public class BmsCustomerPriceSetController extends BaseController
+{
+    @Autowired
+    private IBmsCustomerPriceSetService customerPriceSetService;
+
+    /**
+     * 查询客户已绑定的套餐列表
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/bind/list")
+    public AjaxResult bindList(Long customerId)
+    {
+        List<BmsCustomerPriceSet> list = customerPriceSetService.selectBindList(customerId);
+        return success(list);
+    }
+
+    /**
+     * 查询可绑定的生效套餐选项
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/option/list")
+    public AjaxResult optionList(BmsPriceSetOption query)
+    {
+        return success(customerPriceSetService.selectOptionList(query));
+    }
+
+    /**
+     * 保存客户套餐绑定（已绑定则更新/更换套餐，未绑定则新增）
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:edit')")
+    @Log(title = "客户套餐绑定", businessType = BusinessType.INSERT)
+    @PostMapping("/bind")
+    public AjaxResult saveBind(@RequestBody BmsCustomerPriceSet bind)
+    {
+        bind.setCreateBy(getUsername());
+        bind.setUpdateBy(getUsername());
+        return toAjax(customerPriceSetService.saveBind(bind));
+    }
+
+    /**
+     * 解绑客户套餐
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:edit')")
+    @Log(title = "客户套餐解绑", businessType = BusinessType.DELETE)
+    @DeleteMapping("/bind/{customerPricesetIds}")
+    public AjaxResult removeBind(@PathVariable Long[] customerPricesetIds)
+    {
+        return toAjax(customerPriceSetService.deleteBindByIds(customerPricesetIds));
+    }
+}
@@ -0,0 +1,111 @@
+package com.ruoyi.web.controller.customer.customermoney;
+
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.ar.domain.ArBalanceWriteoff;
+import com.ruoyi.ar.service.IArBalanceWriteoffService;
+import com.ruoyi.ar.service.IArBillService;
+import com.ruoyi.ar.domain.vo.ArBillQuery;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+
+/**
+ * 客户余额核销应收账单 / 账单只读查询 Controller
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@RestController
+@RequestMapping("/customersupplier/customerbill")
+public class CustomerBillController extends BaseController
+{
+    @Autowired
+    private IArBalanceWriteoffService balanceWriteoffService;
+
+    @Autowired
+    private IArBillService billService;
+
+    /**
+     * 查询客户可核销账单（已确认/部分核销，未核销额大于0）
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/unsettled/{customerId}")
+    public AjaxResult unsettled(@PathVariable("customerId") Long customerId)
+    {
+        return success(balanceWriteoffService.selectUnsettledBills(customerId));
+    }
+
+    /**
+     * 查询余额核销记录（分页）
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/writeoff/list")
+    public TableDataInfo writeoffList(ArBalanceWriteoff query)
+    {
+        if (query == null || query.getCustomerId() == null || query.getCustomerId() == 0L)
+        {
+            return getDataTable(Collections.emptyList());
+        }
+        startPage();
+        List<ArBalanceWriteoff> list = balanceWriteoffService.selectWriteoffList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 用客户账户余额核销账单
+     */
+    @PreAuthorize("@ss.hasPermi('customer:bill:writeoff')")
+    @Log(title = "余额核销账单", businessType = BusinessType.UPDATE)
+    @PostMapping("/writeoff")
+    public AjaxResult writeoff(@RequestBody ArBalanceWriteoff cmd)
+    {
+        cmd.setCreateBy(getUsername());
+        return success(balanceWriteoffService.writeoff(cmd));
+    }
+
+    /**
+     * 反核销（取消一笔有效余额核销）
+     */
+    @PreAuthorize("@ss.hasPermi('customer:bill:writeoff:cancel')")
+    @Log(title = "余额核销反核销", businessType = BusinessType.UPDATE)
+    @PutMapping("/writeoff/{writeoffId}/cancel")
+    public AjaxResult cancelWriteoff(@PathVariable("writeoffId") Long writeoffId,
+        @RequestBody(required = false) ArBalanceWriteoff body)
+    {
+        balanceWriteoffService.cancelWriteoff(writeoffId, body == null ? null : body.getCancelRemark());
+        return success();
+    }
+
+    /**
+     * 账单查看：分页查询应收账单（只读，供客户侧账单查看页使用）
+     */
+    @PreAuthorize("@ss.hasPermi('customer:bill:list')")
+    @GetMapping("/list")
+    public TableDataInfo billList(ArBillQuery query)
+    {
+        startPage();
+        return getDataTable(billService.selectArBillList(query));
+    }
+
+    /**
+     * 账单查看：账单详情（含订单明细/费用明细）
+     */
+    @PreAuthorize("@ss.hasPermi('customer:bill:query')")
+    @GetMapping("/{arBillId}")
+    public AjaxResult billInfo(@PathVariable("arBillId") Long arBillId)
+    {
+        return success(billService.selectArBillById(arBillId));
+    }
+}
@@ -17,6 +17,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow;
 import com.ruoyi.customer.customermoney.domain.CustomerReceipt;
 import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;

@@ -118,4 +119,32 @@ public class CustomerMoneyController extends BaseController
        List<CustomerBalanceFlow> list = customerMoneyService.selectFlowList(query);
        return getDataTable(list);
    }
+
+    /**
+     * 查询额度流水列表
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/credit/flow/list")
+    public TableDataInfo creditFlowList(CustomerCreditFlow query)
+    {
+        if (query == null || query.getCustomerId() == null || query.getCustomerId() == 0L) {
+            return getDataTable(Collections.emptyList());
+        }
+        startPage();
+        List<CustomerCreditFlow> list = customerMoneyService.selectCreditFlowList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 调整客户额度（信用额度/临时额度），调整过程留额度流水
+     */
+    @PreAuthorize("@ss.hasPermi('customer:credit:adjust')")
+    @Log(title = "客户额度调整", businessType = BusinessType.UPDATE)
+    @PostMapping("/credit/adjust")
+    public AjaxResult adjustCredit(@RequestBody CustomerCreditFlow flow)
+    {
+        flow.setCreateBy(getUsername());
+        flow.setOperatorId(getUserId());
+        return toAjax(customerMoneyService.adjustCredit(flow));
+    }
 }
@@ -0,0 +1,87 @@
+package com.ruoyi.ar.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 应收账单余额核销 ar_balance_writeoff
+ *
+ * <p>用客户账户余额核销应收账单，与 ar_receipt_writeoff（收款核销）并列，
+ * 两者共享 ar_bill.written_off_amount / unwritten_amount 缓存。</p>
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ArBalanceWriteoff extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 有效 */
+    public static final String STATUS_EFFECTIVE = "EFFECTIVE";
+    /** 已取消（反核销） */
+    public static final String STATUS_CANCELLED = "CANCELLED";
+
+    /** 余额核销ID */
+    private Long writeoffId;
+
+    /** 核销单号（BWO开头） */
+    private String writeoffNo;
+
+    /** 应收账单ID */
+    private Long arBillId;
+
+    /** 账单号快照 */
+    private String billNo;
+
+    /** 客户ID */
+    private Long customerId;
+
+    /** 客户账户ID */
+    private Long accountId;
+
+    /** 币种 */
+    private String currency;
+
+    /** 本次核销金额 */
+    private BigDecimal writeoffAmount;
+
+    /** 核销扣款余额流水ID */
+    private Long balanceFlowId;
+
+    /** 反核销回补余额流水ID */
+    private Long reverseFlowId;
+
+    /** 核销日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date writeoffDate;
+
+    /** 状态：EFFECTIVE/CANCELLED */
+    private String status;
+
+    /** 核销备注 */
+    private String remark;
+
+    /** 反核销人 */
+    private String cancelBy;
+
+    /** 反核销时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
+
+    /** 反核销原因 */
+    private String cancelRemark;
+
+    /* ===== 列表关联展示字段（来自 ar_bill） ===== */
+
+    /** 账单名称 */
+    private String billName;
+
+    /** 客户名称快照 */
+    private String customerName;
+}
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,10 +22,13 @@ public class ArBill extends BaseEntity
    private Long customerId;
    private String customerCode;
    private String customerName;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date billPeriodStart;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date billPeriodEnd;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date billDate;
    private String currency;
@@ -15,7 +15,7 @@ public class ArBillDetail implements Serializable

    private Long detailId;
    private Long arBillId;
-    private String prcBillId;
+    private String prcOrderBillId;
    private Integer detailNo;
    private String orderNo;
    private String trackingNo;
@@ -14,7 +14,7 @@ public class ArBillDetailFee implements Serializable

    private Long detailFeeId;
    private Long detailId;
-    private String prcFeeId;
+    private String prcIncomeBillFeeId;
    private Integer feeNo;
    private String feeType;
    private String feeName;
@@ -0,0 +1,23 @@
+package com.ruoyi.ar.domain.vo;
+
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.ruoyi.ar.domain.ArBill;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/** 应收账单列表查询参数。 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ArBillQuery extends ArBill
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 账单日期查询起始日。 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date billDateStart;
+
+    /** 账单日期查询结束日。 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date billDateEnd;
+}
@@ -0,0 +1,34 @@
+package com.ruoyi.ar.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.ar.domain.ArBalanceWriteoff;
+
+/**
+ * 应收账单余额核销 Mapper
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+public interface ArBalanceWriteoffMapper
+{
+    /** 新增余额核销单 */
+    int insertArBalanceWriteoff(ArBalanceWriteoff writeoff);
+
+    /** 回写扣款账户与余额流水ID */
+    int updateFlowRefs(@Param("writeoffId") Long writeoffId,
+        @Param("accountId") Long accountId,
+        @Param("balanceFlowId") Long balanceFlowId);
+
+    /** 按ID查询（行锁） */
+    ArBalanceWriteoff selectByIdForUpdate(@Param("writeoffId") Long writeoffId);
+
+    /** 反核销：置为CANCELLED并登记回补流水与原因 */
+    int updateCancelled(@Param("writeoffId") Long writeoffId,
+        @Param("reverseFlowId") Long reverseFlowId,
+        @Param("cancelBy") String cancelBy,
+        @Param("cancelRemark") String cancelRemark);
+
+    /** 查询核销记录列表（关联账单名称/客户名称） */
+    List<ArBalanceWriteoff> selectWriteoffList(ArBalanceWriteoff query);
+}
@@ -5,10 +5,11 @@ import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.ar.domain.ArBill;
+import com.ruoyi.ar.domain.vo.ArBillQuery;

 public interface ArBillMapper
 {
-    List<ArBill> selectArBillList(ArBill query);
+    List<ArBill> selectArBillList(ArBillQuery query);

    ArBill selectArBillById(Long arBillId);

@@ -19,6 +20,9 @@ public interface ArBillMapper

    ArBill selectArBillByIdForUpdate(Long arBillId);

+    /** 查询客户可核销账单（已确认/部分核销），按账单日期升序，供余额核销选择 */
+    List<ArBill> selectUnsettledByCustomer(@Param("customerId") Long customerId);
+
    int insertArBill(ArBill bill);

    int updateArBillStatus(@Param("arBillId") Long arBillId, @Param("status") String status,
@@ -0,0 +1,30 @@
+package com.ruoyi.ar.service;
+
+import java.util.List;
+import com.ruoyi.ar.domain.ArBalanceWriteoff;
+import com.ruoyi.ar.domain.ArBill;
+
+/**
+ * 应收账单余额核销 Service接口
+ *
+ * <p>资金来源为客户账户余额（customer_account.balance），与收款核销
+ * （ar_receipt_writeoff）并列；核销时三方联动：账户余额扣减、已用额度释放、
+ * 账单已核销/未核销金额及状态更新。</p>
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+public interface IArBalanceWriteoffService
+{
+    /** 查询客户可核销账单（已确认/部分核销，未核销额大于0） */
+    List<ArBill> selectUnsettledBills(Long customerId);
+
+    /** 查询余额核销记录 */
+    List<ArBalanceWriteoff> selectWriteoffList(ArBalanceWriteoff query);
+
+    /** 用客户账户余额核销账单 */
+    ArBalanceWriteoff writeoff(ArBalanceWriteoff cmd);
+
+    /** 反核销（取消一笔有效余额核销，余额回补、账单金额回退） */
+    void cancelWriteoff(Long writeoffId, String remark);
+}
@@ -8,11 +8,12 @@ import com.ruoyi.ar.domain.ArBillLog;
 import com.ruoyi.ar.domain.vo.ArBillGenerateRequest;
 import com.ruoyi.ar.domain.vo.ArBillGenerateQuery;
 import com.ruoyi.ar.domain.vo.ArBillActionRequest;
+import com.ruoyi.ar.domain.vo.ArBillQuery;
 import com.ruoyi.price.domain.PrcOrderBill;

 public interface IArBillService
 {
-    List<ArBill> selectArBillList(ArBill query);
+    List<ArBill> selectArBillList(ArBillQuery query);

    ArBill selectArBillById(Long arBillId);

@@ -0,0 +1,249 @@
+package com.ruoyi.ar.service.impl;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import com.ruoyi.ar.domain.ArBalanceWriteoff;
+import com.ruoyi.ar.domain.ArBill;
+import com.ruoyi.ar.domain.ArBillLog;
+import com.ruoyi.ar.enums.ArBillStatus;
+import com.ruoyi.ar.enums.ArLogResult;
+import com.ruoyi.ar.mapper.ArBalanceWriteoffMapper;
+import com.ruoyi.ar.mapper.ArBillMapper;
+import com.ruoyi.ar.service.IArBalanceWriteoffService;
+import com.ruoyi.ar.service.IArBillLogService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;
+
+/**
+ * 应收账单余额核销 Service实现
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Service
+public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService
+{
+    private static final DateTimeFormatter NO_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");
+    private static final int MONEY_SCALE = 2;
+
+    @Autowired
+    private ArBillMapper billMapper;
+
+    @Autowired
+    private ArBalanceWriteoffMapper writeoffMapper;
+
+    @Autowired
+    private IArBillLogService logService;
+
+    @Autowired
+    private ICustomerMoneyService customerMoneyService;
+
+    @Override
+    public List<ArBill> selectUnsettledBills(Long customerId)
+    {
+        if (customerId == null)
+        {
+            return List.of();
+        }
+        return billMapper.selectUnsettledByCustomer(customerId);
+    }
+
+    @Override
+    public List<ArBalanceWriteoff> selectWriteoffList(ArBalanceWriteoff query)
+    {
+        return writeoffMapper.selectWriteoffList(query);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ArBalanceWriteoff writeoff(ArBalanceWriteoff cmd)
+    {
+        if (cmd == null || cmd.getArBillId() == null)
+        {
+            throw new ServiceException("请选择要核销的账单");
+        }
+        BigDecimal amount = cmd.getWriteoffAmount();
+        if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            throw new ServiceException("核销金额必须大于0");
+        }
+        amount = amount.setScale(MONEY_SCALE, RoundingMode.HALF_UP);
+
+        // 1. 行锁锁定账单（加锁顺序：账单 -> 账户，与反核销保持一致）
+        ArBill bill = billMapper.selectArBillByIdForUpdate(cmd.getArBillId());
+        if (bill == null)
+        {
+            throw new ServiceException("应收账单不存在");
+        }
+        ArBillStatus status = ArBillStatus.of(bill.getStatus());
+        if (status == null || !status.canWriteOff())
+        {
+            throw new ServiceException("当前账单状态不允许核销：" + (status == null ? bill.getStatus() : status.getLabel()));
+        }
+        if (cmd.getCustomerId() != null && !cmd.getCustomerId().equals(bill.getCustomerId()))
+        {
+            throw new ServiceException("账单与所选客户不匹配");
+        }
+        BigDecimal unwritten = nvl(bill.getUnwrittenAmount());
+        if (amount.compareTo(unwritten) > 0)
+        {
+            throw new ServiceException("核销金额超过账单未核销金额：" + unwritten.toPlainString());
+        }
+
+        String operator = SecurityUtils.getUsername();
+        String requestId = IdUtils.fastSimpleUUID();
+        String currency = StringUtils.hasText(bill.getCurrency()) ? bill.getCurrency().trim().toUpperCase() : "CNY";
+        Date writeoffDate = cmd.getWriteoffDate() != null ? cmd.getWriteoffDate() : new Date();
+        String fromStatus = bill.getStatus();
+
+        // 2. 先落核销单（账户与流水引用拿到后回写）
+        ArBalanceWriteoff writeoff = new ArBalanceWriteoff();
+        writeoff.setWriteoffNo(generateNo());
+        writeoff.setArBillId(bill.getArBillId());
+        writeoff.setBillNo(bill.getBillNo());
+        writeoff.setCustomerId(bill.getCustomerId());
+        writeoff.setCurrency(currency);
+        writeoff.setWriteoffAmount(amount);
+        writeoff.setWriteoffDate(writeoffDate);
+        writeoff.setStatus(ArBalanceWriteoff.STATUS_EFFECTIVE);
+        writeoff.setRemark(StringUtils.hasText(cmd.getRemark()) ? cmd.getRemark().trim() : null);
+        writeoff.setCreateBy(operator);
+        writeoffMapper.insertArBalanceWriteoff(writeoff);
+
+        // 3. 扣减账户余额并释放等额已用额度，写 BILL_PAY 扣款流水（余额不足在此处拦截）
+        String flowRemark = "余额核销账单：" + bill.getBillNo()
+            + (StringUtils.hasText(writeoff.getRemark()) ? "（" + writeoff.getRemark() + "）" : "");
+        CustomerBalanceFlow flow = customerMoneyService.payBill(bill.getCustomerId(), currency,
+            amount, writeoff.getWriteoffId(), bill.getBillNo(), flowRemark);
+        writeoffMapper.updateFlowRefs(writeoff.getWriteoffId(), flow.getAccountId(), flow.getId());
+
+        // 4. 更新账单已核销/未核销缓存与状态（乐观条件更新，状态被并发改动则整体回滚）
+        BigDecimal written = nvl(bill.getWrittenOffAmount()).add(amount);
+        BigDecimal newUnwritten = unwritten.subtract(amount);
+        String nextStatus = billStatus(written, nvl(bill.getTotalAmount()), fromStatus);
+        if (billMapper.updateArBillAmounts(bill.getArBillId(), written, newUnwritten,
+            nextStatus, operator, fromStatus) != 1)
+        {
+            throw new ServiceException("账单状态已发生变化，请刷新后重试");
+        }
+
+        recordLog(bill.getArBillId(), writeoff.getWriteoffId(), "BALANCE_WRITEOFF",
+            "账户余额核销账单 " + amount.toPlainString() + " " + currency,
+            fromStatus, nextStatus, operator, requestId);
+        writeoff.setAccountId(flow.getAccountId());
+        writeoff.setBalanceFlowId(flow.getId());
+        return writeoff;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelWriteoff(Long writeoffId, String remark)
+    {
+        if (writeoffId == null)
+        {
+            throw new ServiceException("核销记录不存在");
+        }
+        // 1. 锁核销单 -> 锁账单（与核销相同的加锁顺序）
+        ArBalanceWriteoff writeoff = writeoffMapper.selectByIdForUpdate(writeoffId);
+        if (writeoff == null)
+        {
+            throw new ServiceException("核销记录不存在");
+        }
+        if (!ArBalanceWriteoff.STATUS_EFFECTIVE.equals(writeoff.getStatus()))
+        {
+            throw new ServiceException("只有有效状态的核销记录可以反核销");
+        }
+        ArBill bill = billMapper.selectArBillByIdForUpdate(writeoff.getArBillId());
+        if (bill == null)
+        {
+            throw new ServiceException("核销关联的账单不存在");
+        }
+
+        String operator = SecurityUtils.getUsername();
+        String requestId = IdUtils.fastSimpleUUID();
+        String cancelRemark = StringUtils.hasText(remark) ? remark.trim() : "取消余额核销";
+        String fromStatus = bill.getStatus();
+
+        // 2. 余额回补、已用额度重新占用，写反向 BILL_PAY 流水
+        String flowRemark = "反核销回补账单：" + bill.getBillNo() + "（" + cancelRemark + "）";
+        CustomerBalanceFlow reverseFlow = customerMoneyService.reverseBillPay(writeoff.getCustomerId(),
+            writeoff.getCurrency(), nvl(writeoff.getWriteoffAmount()), writeoffId, bill.getBillNo(), flowRemark);
+
+        // 3. 账单核销金额回退，状态按剩余已核销额重算（归零则回到已确认）
+        BigDecimal written = nvl(bill.getWrittenOffAmount()).subtract(nvl(writeoff.getWriteoffAmount()));
+        if (written.compareTo(BigDecimal.ZERO) < 0)
+        {
+            written = BigDecimal.ZERO;
+        }
+        BigDecimal newUnwritten = nvl(bill.getTotalAmount()).subtract(written);
+        String nextStatus = billStatus(written, nvl(bill.getTotalAmount()), fromStatus);
+        if (billMapper.updateArBillAmounts(bill.getArBillId(), written, newUnwritten,
+            nextStatus, operator, fromStatus) != 1)
+        {
+            throw new ServiceException("账单状态已发生变化，请刷新后重试");
+        }
+
+        // 4. 核销单置为CANCELLED并登记回补流水
+        if (writeoffMapper.updateCancelled(writeoffId, reverseFlow.getId(), operator, cancelRemark) != 1)
+        {
+            throw new ServiceException("核销记录状态已变化，请刷新后重试");
+        }
+        recordLog(bill.getArBillId(), writeoffId, "CANCEL_BALANCE_WRITEOFF",
+            "反核销回补账单：" + cancelRemark,
+            fromStatus, nextStatus, operator, requestId);
+    }
+
+    /** 账单状态重算：已核销归零（非草稿）-> 已确认；足额 -> 已核销；否则部分核销 */
+    private String billStatus(BigDecimal written, BigDecimal total, String current)
+    {
+        if (written.compareTo(BigDecimal.ZERO) == 0)
+        {
+            return ArBillStatus.DRAFT.getCode().equals(current)
+                ? ArBillStatus.DRAFT.getCode() : ArBillStatus.CONFIRMED.getCode();
+        }
+        return written.compareTo(total) >= 0
+            ? ArBillStatus.WRITTEN_OFF.getCode() : ArBillStatus.PARTIAL_WRITTEN_OFF.getCode();
+    }
+
+    private void recordLog(Long billId, Long writeoffId, String operationType, String desc,
+        String fromStatus, String toStatus, String operator, String requestId)
+    {
+        ArBillLog log = new ArBillLog();
+        log.setArBillId(billId);
+        log.setObjectType("BALANCE_WRITEOFF");
+        log.setObjectId(String.valueOf(writeoffId));
+        log.setOperationType(operationType);
+        log.setOperationDesc(desc);
+        log.setFromStatus(fromStatus);
+        log.setToStatus(toStatus);
+        log.setOperatorId(operator);
+        log.setOperatorName(operator);
+        log.setOperationSource("WEB");
+        log.setRequestId(requestId);
+        log.setResult(ArLogResult.SUCCESS.getCode());
+        logService.record(log);
+    }
+
+    private String generateNo()
+    {
+        return "BWO" + LocalDateTime.now().format(NO_FORMATTER)
+            + ThreadLocalRandom.current().nextInt(100, 1000);
+    }
+
+    private BigDecimal nvl(BigDecimal value)
+    {
+        return value == null ? BigDecimal.ZERO : value;
+    }
+}
@@ -50,6 +50,7 @@ import com.ruoyi.ar.service.IArBillService;
 import com.ruoyi.ar.domain.vo.ArBillActionRequest;
 import com.ruoyi.ar.domain.vo.ArBillGenerateQuery;
 import com.ruoyi.ar.domain.vo.ArBillGenerateRequest;
+import com.ruoyi.ar.domain.vo.ArBillQuery;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
@@ -57,6 +58,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;
 import com.ruoyi.price.domain.PrcIncomeBillFee;
 import com.ruoyi.price.domain.PrcOrderBill;
 import com.ruoyi.price.mapper.PrcIncomeBillFeeMapper;
@@ -79,9 +81,10 @@ public class ArBillServiceImpl implements IArBillService
    @Autowired private IArBillLogService logService;
    @Autowired private PrcOrderBillMapper sourceBillMapper;
    @Autowired private PrcIncomeBillFeeMapper sourceFeeMapper;
+    @Autowired private ICustomerMoneyService customerMoneyService;

    @Override
-    public List<ArBill> selectArBillList(ArBill query)
+    public List<ArBill> selectArBillList(ArBillQuery query)
    {
        List<ArBill> bills = billMapper.selectArBillList(query);
        for (ArBill bill : bills)
@@ -224,7 +227,7 @@ public class ArBillServiceImpl implements IArBillService
        Map<String, ArBillDetail> detailsBySourceBill = new HashMap<>();
        for (ArBillDetail detail : detailMapper.selectByBillId(bill.getArBillId()))
        {
-            detailsBySourceBill.put(detail.getPrcBillId(), detail);
+            detailsBySourceBill.put(detail.getPrcOrderBillId(), detail);
        }
        List<ArBillDetailFee> detailFees = new ArrayList<>();
        List<PrcIncomeBillFee> sourceFees = sourceBillIds.isEmpty()
@@ -276,6 +279,9 @@ public class ArBillServiceImpl implements IArBillService
            throw failure(arBillId, "BILL", String.valueOf(arBillId), "CONFIRM", bill.getStatus(),
                "账单状态已发生变化，请刷新后重试", operator, requestId);
        }
+        // 账单确认：应收形成，按账单金额占用客户授信额度（账户不存在时仅CNY会自动初始化）
+        customerMoneyService.occupyCredit(bill.getCustomerId(), bill.getCurrency(),
+            nvl(bill.getTotalAmount()));
        recordSuccess(bill, "CONFIRM", "确认应收账单", ArBillStatus.DRAFT.getCode(), ArBillStatus.CONFIRMED.getCode(), requestId, operator);
        return selectArBillById(arBillId);
    }
@@ -303,9 +309,9 @@ public class ArBillServiceImpl implements IArBillService
        List<String> sourceBillIds = new ArrayList<>();
        for (ArBillDetail detail : detailMapper.selectByBillId(arBillId))
        {
-            if (!StringUtils.isEmpty(detail.getPrcBillId()))
+            if (!StringUtils.isEmpty(detail.getPrcOrderBillId()))
            {
-                sourceBillIds.add(detail.getPrcBillId());
+                sourceBillIds.add(detail.getPrcOrderBillId());
            }
        }
        if (billMapper.updateArBillStatus(arBillId, ArBillStatus.VOID.getCode(), remark, operator, currentStatus.getCode()) != 1)
@@ -313,6 +319,12 @@ public class ArBillServiceImpl implements IArBillService
            throw failure(arBillId, "BILL", String.valueOf(arBillId), "VOID", bill.getStatus(),
                "账单状态已发生变化，请刷新后重试", operator, requestId);
        }
+        // 账单作废：已确认账单占用的授信额度全额释放（可作废的CONFIRMED账单必然零核销）
+        if (currentStatus == ArBillStatus.CONFIRMED)
+        {
+            customerMoneyService.releaseCredit(bill.getCustomerId(), bill.getCurrency(),
+                nvl(bill.getTotalAmount()));
+        }
        if (!sourceBillIds.isEmpty())
        {
            int releasedCount = sourceBillMapper.releaseArBillOrders(sourceBillIds, operator,
@@ -459,7 +471,7 @@ public class ArBillServiceImpl implements IArBillService
    {
        ArBillDetail detail = new ArBillDetail();
        detail.setArBillId(bill.getArBillId());
-        detail.setPrcBillId(source.getBillId());
+        detail.setPrcOrderBillId(source.getBillId());
        detail.setDetailNo(detailNo);
        detail.setOrderNo(source.getOrderNo());
        detail.setTrackingNo(source.getTrackingNo());
@@ -487,7 +499,7 @@ public class ArBillServiceImpl implements IArBillService
    {
        ArBillDetailFee fee = new ArBillDetailFee();
        fee.setDetailId(detail.getDetailId());
-        fee.setPrcFeeId(source.getFeeId());
+        fee.setPrcIncomeBillFeeId(source.getFeeId());
        fee.setFeeNo(feeNo);
        fee.setFeeType(source.getFeeType());
        fee.setFeeName(source.getFeeName());
@@ -0,0 +1,72 @@
+package com.ruoyi.customer.customerinfo.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户套餐绑定对象 prc_customer_price_set
+ * 客户管理-客户编辑-绑定套餐 使用；关联 prc_price_set 的字段仅用于页面展示
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BmsCustomerPriceSet extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 客户价格套餐ID */
+    private Long customerPricesetId;
+
+    /** 价格套餐ID */
+    private Long priceSetId;
+
+    /** 客户ID */
+    private Long customerId;
+
+    /** 客户代码 */
+    private String customerCode;
+
+    /** 客户名称 */
+    private String customerName;
+
+    /** 绑定优先级，数字越小越优先 */
+    private Integer bindPriority;
+
+    /** 价格开始生效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date prBegindate;
+
+    /** 价格失效日期（空=长期） */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date prEnddate;
+
+    /** 绑定备注 */
+    private String priceSetNote;
+
+    /* -------- 关联 prc_price_set 展示字段 -------- */
+
+    /** 套餐编码 */
+    private String priceSetCode;
+
+    /** 套餐名称 */
+    private String priceSetName;
+
+    /** 计价类型 FIXED=固定价 DISCOUNT=折扣 */
+    private String setType;
+
+    /** 套餐状态 D草稿 A审核中 E生效 R驳回 S停用 */
+    private String priceSetStatus;
+
+    /** 套餐生效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date setEffectiveDate;
+
+    /** 套餐失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date setExpireDate;
+}
@@ -0,0 +1,42 @@
+package com.ruoyi.customer.customerinfo.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 价格套餐（prc_price_set）简要对象
+ * 仅用于客户编辑-绑定套餐的套餐下拉选择，不参与套餐维护
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Data
+public class BmsPriceSetOption
+{
+    /** 价格套餐ID */
+    private Long priceSetId;
+
+    /** 套餐编码 */
+    private String priceSetCode;
+
+    /** 套餐名称 */
+    private String priceSetName;
+
+    /** 计价类型 FIXED=固定价 DISCOUNT=折扣 */
+    private String setType;
+
+    /** 套餐状态 D草稿 A审核中 E生效 R驳回 S停用 */
+    private String status;
+
+    /** 生效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date effectiveDate;
+
+    /** 失效日期（空=长期） */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expireDate;
+
+    /** 关键字（编码/名称模糊） */
+    private String keyword;
+}
@@ -23,6 +23,15 @@ public interface BmsCustomerMapper
     */
    public BmsCustomer selectBmsCustomerByCustomerId(Long customerId);

+    /**
+     * 只取客户档案物理额度列（credit_ed 在通用查询里是账户可用额度的子查询别名，
+     * 账户首次初始化时必须读取档案原始值）
+     *
+     * @param customerId 客户ID
+     * @return 仅含 creditEd/tempEd 的客户对象
+     */
+    public BmsCustomer selectRawCreditByCustomerId(Long customerId);
+
    /**
     * 查询客户主列表
     * 
@@ -103,6 +112,20 @@ public interface BmsCustomerMapper
     */
    public int deleteBmsCustomerProfileAttachmentByCustomerId(Long customerId);

+    /**
+     * 同步客户档案额度字段（额度以客户余额账户为准，调整后回写档案）
+     *
+     * @param customerId 客户ID
+     * @param creditEd 信用额度
+     * @param tempEd 临时额度
+     * @param updateBy 更新人
+     * @return 结果
+     */
+    public int updateCustomerCredit(@org.apache.ibatis.annotations.Param("customerId") Long customerId,
+                                  @org.apache.ibatis.annotations.Param("creditEd") java.math.BigDecimal creditEd,
+                                  @org.apache.ibatis.annotations.Param("tempEd") java.math.BigDecimal tempEd,
+                                  @org.apache.ibatis.annotations.Param("updateBy") String updateBy);
+
    /**
     * 批量删除客户附件
     *
@@ -0,0 +1,39 @@
+package com.ruoyi.customer.customerinfo.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet;
+import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption;
+
+/**
+ * 客户套餐绑定 数据层（客户管理侧独立实现，操作 prc_customer_price_set）
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+public interface BmsCustomerPriceSetMapper
+{
+    /** 按客户查绑定列表（join prc_price_set 取套餐展示字段） */
+    public List<BmsCustomerPriceSet> selectBindListByCustomerId(@Param("customerId") Long customerId);
+
+    /** 按主键查绑定 */
+    public BmsCustomerPriceSet selectBindById(Long customerPricesetId);
+
+    /** 按客户ID查绑定（uk_customer_one_set 保证至多一条） */
+    public BmsCustomerPriceSet selectBindByCustomerId(@Param("customerId") Long customerId);
+
+    /** 新增绑定 */
+    public int insertBind(BmsCustomerPriceSet bind);
+
+    /** 更新绑定（允许更换套餐 price_set_id 与生效区间/优先级/备注） */
+    public int updateBind(BmsCustomerPriceSet bind);
+
+    /** 按主键批量解绑 */
+    public int deleteBindByIds(Long[] customerPricesetIds);
+
+    /** 套餐下拉选项（只列生效中套餐，可按关键字/类型过滤） */
+    public List<BmsPriceSetOption> selectPriceSetOptionList(BmsPriceSetOption query);
+
+    /** 按主键查套餐简要信息 */
+    public BmsPriceSetOption selectPriceSetOptionById(@Param("priceSetId") Long priceSetId);
+}
@@ -0,0 +1,28 @@
+package com.ruoyi.customer.customerinfo.service;
+
+import java.util.List;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet;
+import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption;
+
+/**
+ * 客户套餐绑定 服务层（客户管理侧）
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+public interface IBmsCustomerPriceSetService
+{
+    /** 查询某客户的套餐绑定列表 */
+    public List<BmsCustomerPriceSet> selectBindList(Long customerId);
+
+    /** 查询可绑定的生效套餐选项 */
+    public List<BmsPriceSetOption> selectOptionList(BmsPriceSetOption query);
+
+    /**
+     * 保存客户套餐绑定（一个客户一条记录）：已绑定则更新（支持更换套餐），未绑定则新增
+     */
+    public int saveBind(BmsCustomerPriceSet bind);
+
+    /** 按绑定主键解绑 */
+    public int deleteBindByIds(Long[] customerPricesetIds);
+}
@@ -0,0 +1,116 @@
+package com.ruoyi.customer.customerinfo.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomer;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet;
+import com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption;
+import com.ruoyi.customer.customerinfo.mapper.BmsCustomerPriceSetMapper;
+import com.ruoyi.customer.customerinfo.service.IBmsCustomerPriceSetService;
+import com.ruoyi.customer.customerinfo.service.IBmsCustomerService;
+
+/**
+ * 客户套餐绑定 服务实现（客户管理侧，独立于价格套餐维护模块）
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Service
+public class BmsCustomerPriceSetServiceImpl implements IBmsCustomerPriceSetService
+{
+    @Autowired
+    private BmsCustomerPriceSetMapper bindMapper;
+
+    @Autowired
+    private IBmsCustomerService customerService;
+
+    @Override
+    public List<BmsCustomerPriceSet> selectBindList(Long customerId)
+    {
+        if (customerId == null)
+        {
+            return List.of();
+        }
+        return bindMapper.selectBindListByCustomerId(customerId);
+    }
+
+    @Override
+    public List<BmsPriceSetOption> selectOptionList(BmsPriceSetOption query)
+    {
+        return bindMapper.selectPriceSetOptionList(query);
+    }
+
+    @Override
+    public int saveBind(BmsCustomerPriceSet bind)
+    {
+        if (bind.getCustomerId() == null)
+        {
+            throw new ServiceException("客户ID不能为空");
+        }
+        if (bind.getPriceSetId() == null)
+        {
+            throw new ServiceException("请选择要绑定的套餐");
+        }
+        BmsCustomer customer = customerService.selectBmsCustomerByCustomerId(bind.getCustomerId());
+        if (customer == null)
+        {
+            throw new ServiceException("客户不存在或已被删除");
+        }
+        BmsPriceSetOption set = bindMapper.selectPriceSetOptionById(bind.getPriceSetId());
+        if (set == null)
+        {
+            throw new ServiceException("所选套餐不存在");
+        }
+        if (!"E".equals(set.getStatus()))
+        {
+            throw new ServiceException("仅生效中的套餐允许绑定，当前套餐状态不可用");
+        }
+        if (bind.getPrBegindate() == null)
+        {
+            bind.setPrBegindate(set.getEffectiveDate());
+        }
+        if (bind.getPrBegindate() == null)
+        {
+            throw new ServiceException("绑定生效日期不能为空");
+        }
+        if (bind.getPrEnddate() != null && bind.getPrBegindate().after(bind.getPrEnddate()))
+        {
+            throw new ServiceException("失效日期不能早于生效日期");
+        }
+        if (bind.getBindPriority() == null || bind.getBindPriority() < 1)
+        {
+            bind.setBindPriority(1);
+        }
+
+        bind.setCustomerCode(customer.getCustomerCode());
+        bind.setCustomerName(customer.getCustomerName());
+
+        BmsCustomerPriceSet existing = bindMapper.selectBindByCustomerId(bind.getCustomerId());
+        try
+        {
+            if (existing != null)
+            {
+                bind.setCustomerPricesetId(existing.getCustomerPricesetId());
+                return bindMapper.updateBind(bind);
+            }
+            return bindMapper.insertBind(bind);
+        }
+        catch (DuplicateKeyException e)
+        {
+            throw new ServiceException("该客户已存在套餐绑定，请勿重复绑定");
+        }
+    }
+
+    @Override
+    public int deleteBindByIds(Long[] customerPricesetIds)
+    {
+        if (customerPricesetIds == null || customerPricesetIds.length == 0)
+        {
+            throw new ServiceException("请选择要解绑的记录");
+        }
+        return bindMapper.deleteBindByIds(customerPricesetIds);
+    }
+}
@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper;
 import com.ruoyi.customer.customerinfo.domain.BmsCustomer;
 import com.ruoyi.customer.customerinfo.service.IBmsCustomerService;
+import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;

 /**
 * 客户主Service业务层处理
@@ -27,6 +28,9 @@ public class BmsCustomerServiceImpl implements IBmsCustomerService
    @Autowired
    private BmsCustomerMapper bmsCustomerMapper;

+    @Autowired
+    private ICustomerMoneyService customerMoneyService;
+
    /**
     * 查询客户主
     * 
@@ -226,6 +230,8 @@ public class BmsCustomerServiceImpl implements IBmsCustomerService
            saveBmsCustomerAttachments(bmsCustomer.getCustomerId(), bmsCustomer.getAttachmentList());
            saveBmsCustomerCompanies(bmsCustomer.getCustomerId(), bmsCustomer.getCompanyList());
            saveBmsCustomerContacts(bmsCustomer.getCustomerId(), bmsCustomer.getContactList());
+            // 新建客户即初始化默认CNY账户：余额0、总额度1000 CNY，写INIT流水
+            customerMoneyService.initDefaultCnyAccount(bmsCustomer.getCustomerId());
        }
        return rows;
    }
@@ -1,6 +1,8 @@
 package com.ruoyi.customer.customermoney.domain;

 import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -35,9 +37,17 @@ public class CustomerAccount extends BaseEntity
    /** 总额度 */
    private BigDecimal totalCredit;

-    /** 额外额度 */
+    /** 额外额度（临时额度） */
    private BigDecimal extraCredit;

+    /** 临时额度生效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date extraEffectiveDate;
+
+    /** 临时额度失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date extraExpireDate;
+
    /** 已用额度 */
    private BigDecimal usedCredit;

@@ -0,0 +1,93 @@
+package com.ruoyi.customer.customermoney.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户额度流水 customer_credit_flow
+ *
+ * @author ruoyi
+ * @date 2026-09-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CustomerCreditFlow extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 额度类型：信用额度（长期） */
+    public static final String CREDIT_TYPE_CREDIT = "CREDIT";
+    /** 额度类型：临时额度 */
+    public static final String CREDIT_TYPE_TEMP = "TEMP";
+
+    /** 变动类型：初始化 */
+    public static final String CHANGE_INIT = "INIT";
+    /** 变动类型：手工调整 */
+    public static final String CHANGE_ADJUST = "ADJUST";
+    /** 变动类型：到期自动失效 */
+    public static final String CHANGE_EXPIRE = "EXPIRE";
+
+    /** 调整方式：设置为 */
+    public static final String MODE_SET = "SET";
+    /** 调整方式：增加 */
+    public static final String MODE_ADD = "ADD";
+    /** 调整方式：减少 */
+    public static final String MODE_SUB = "SUB";
+
+    /** 主键 */
+    private Long id;
+
+    /** 流水号 */
+    private String flowNo;
+
+    /** 客户ID */
+    private Long customerId;
+
+    /** 客户账户ID */
+    private Long accountId;
+
+    /** 额度类型：CREDIT信用额度 TEMP临时额度 */
+    private String creditType;
+
+    /** 变动类型：INIT初始化 ADJUST调整 EXPIRE到期失效 */
+    private String changeType;
+
+    /** 变动方向：1增加 -1减少 0持平 */
+    private Integer direction;
+
+    /** 变动前额度 */
+    private BigDecimal beforeAmount;
+
+    /** 变动额度（恒为非负数，方向看 direction） */
+    private BigDecimal changeAmount;
+
+    /** 变动后额度 */
+    private BigDecimal afterAmount;
+
+    /** 变动时已用额度快照 */
+    private BigDecimal usedCredit;
+
+    /** 生效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date effectiveDate;
+
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date expireDate;
+
+    /** 调整原因 */
+    private String reason;
+
+    /** 调整方式（仅ADJUST流水有值）：SET/ADD/SUB */
+    private String adjustMode;
+
+    /** 操作人ID */
+    private Long operatorId;
+
+    /** 删除标志（0存在 1删除） */
+    private String delFlag;
+}
@@ -4,6 +4,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.customer.customermoney.domain.CustomerAccount;
 import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow;
 import com.ruoyi.customer.customermoney.domain.CustomerReceipt;

 /**
@@ -33,6 +34,17 @@ public interface CustomerMoneyMapper
    /** 乐观锁更新余额 */
    int updateAccountBalance(CustomerAccount account);

+    /** 乐观锁更新额度（信用额度/临时额度/有效期） */
+    int updateAccountCredit(CustomerAccount account);
+
+    /* ================= 额度流水 ================= */
+
+    /** 查询额度流水 */
+    List<CustomerCreditFlow> selectCreditFlowList(CustomerCreditFlow query);
+
+    /** 新增额度流水 */
+    int insertCreditFlow(CustomerCreditFlow flow);
+
    /* ================= 客户收款 ================= */

    /** 查询收款单列表 */
@@ -1,8 +1,10 @@
 package com.ruoyi.customer.customermoney.service;

+import java.math.BigDecimal;
 import java.util.List;
 import com.ruoyi.customer.customermoney.domain.CustomerAccount;
 import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow;
 import com.ruoyi.customer.customermoney.domain.CustomerReceipt;

 /**
@@ -16,6 +18,15 @@ public interface ICustomerMoneyService
    /** 查询客户各币种账户 */
    List<CustomerAccount> selectAccountList(Long customerId);

+    /**
+     * 新建客户时初始化默认CNY账户（余额0，默认总额度1000 CNY），并写 INIT 额度流水。
+     * 已存在CNY账户时不重复创建。
+     *
+     * @param customerId 客户ID
+     * @return 1=已初始化或已存在
+     */
+    int initDefaultCnyAccount(Long customerId);
+
    /** 查询收款单列表 */
    List<CustomerReceipt> selectReceiptList(CustomerReceipt query);

@@ -36,4 +47,46 @@ public interface ICustomerMoneyService

    /** 查询余额流水列表 */
    List<CustomerBalanceFlow> selectFlowList(CustomerBalanceFlow query);
+
+    /** 查询额度流水列表 */
+    List<CustomerCreditFlow> selectCreditFlowList(CustomerCreditFlow query);
+
+    /**
+     * 调整客户额度（信用额度/临时额度）
+     * 事务内：锁定CNY账户（不存在则初始化）-> 校验（不能为负、不能低于已用额度）
+     * -> 乐观锁更新额度 -> 回写客户档案额度字段 -> 写额度流水
+     */
+    int adjustCredit(CustomerCreditFlow flow);
+
+    /**
+     * 账单确认时占用授信额度（used_credit += amount）。该币种账户不存在时跳过。
+     * 调用方必须已持有账单行锁，本方法内部再锁账户（加锁顺序：账单 -> 账户）。
+     */
+    void occupyCredit(Long customerId, String currency, BigDecimal amount);
+
+    /**
+     * 账单作废时释放授信额度（used_credit -= amount，不小于0）。该币种账户不存在时跳过。
+     * 调用方必须已持有账单行锁。
+     */
+    void releaseCredit(Long customerId, String currency, BigDecimal amount);
+
+    /**
+     * 用账户余额核销账单：校验余额充足 -> balance -= amount、used_credit -= amount
+     * -> 写一条 BILL_PAY 扣款流水（direction=-1）。返回已落库的流水（含ID）。
+     *
+     * @param bizId 余额核销单ID
+     * @param bizNo 账单号
+     */
+    CustomerBalanceFlow payBill(Long customerId, String currency, BigDecimal amount,
+        Long bizId, String bizNo, String remark);
+
+    /**
+     * 反核销回补：balance += amount、used_credit += amount（重新占用授信）
+     * -> 写一条 BILL_PAY 回补流水（direction=1）。返回已落库的流水（含ID）。
+     *
+     * @param bizId 余额核销单ID
+     * @param bizNo 账单号
+     */
+    CustomerBalanceFlow reverseBillPay(Long customerId, String currency, BigDecimal amount,
+        Long bizId, String bizNo, String remark);
 }
@@ -2,6 +2,7 @@ package com.ruoyi.customer.customermoney.service.impl;

 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -14,10 +15,12 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.customer.customerinfo.domain.BmsCustomer;
 import com.ruoyi.customer.customerinfo.domain.BmsCustomerAttachment;
 import com.ruoyi.customer.customerinfo.mapper.BmsCustomerMapper;
 import com.ruoyi.customer.customermoney.domain.CustomerAccount;
 import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow;
 import com.ruoyi.customer.customermoney.domain.CustomerReceipt;
 import com.ruoyi.customer.customermoney.mapper.CustomerMoneyMapper;
 import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;
@@ -37,6 +40,8 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService

    /** 本位币币种 */
    private static final String BASE_CURRENCY = BmsExchangeRate.BASE_CURRENCY;
+    /** 新客户默认总额度（CNY） */
+    private static final BigDecimal DEFAULT_CREDIT = new BigDecimal("1000");
    /** 金额保留位数 */
    private static final int MONEY_SCALE = 2;

@@ -50,9 +55,25 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
    private IBmsExchangeRateService exchangeRateService;

    @Override
+    @Transactional(rollbackFor = Exception.class)
    public List<CustomerAccount> selectAccountList(Long customerId)
    {
-        return customerMoneyMapper.selectAccountListByCustomerId(customerId);
+        List<CustomerAccount> list = customerMoneyMapper.selectAccountListByCustomerId(customerId);
+        // 查询时顺带处理临时额度到期自动失效（仅CNY账户），保证卡片展示为最新值
+        for (int i = 0; i < list.size(); i++)
+        {
+            CustomerAccount account = list.get(i);
+            if (BASE_CURRENCY.equals(account.getCurrency()) && isTempCreditExpired(account))
+            {
+                CustomerAccount locked = customerMoneyMapper.selectAccountForUpdate(customerId, BASE_CURRENCY);
+                expireTempCreditIfNeeded(locked);
+                if (locked != null)
+                {
+                    list.set(i, locked);
+                }
+            }
+        }
+        return list;
    }

    @Override
@@ -167,23 +188,8 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
                ? receipt.getBaseAmount()
                : originalAmount.multiply(rate).setScale(MONEY_SCALE, RoundingMode.HALF_UP);

-        // 1. 行锁锁定客户本位币(CNY)账户，不存在则自动初始化。无论收什么币种，一律折算 CNY 入账
-        CustomerAccount account = customerMoneyMapper.selectAccountForUpdate(receipt.getCustomerId(), BASE_CURRENCY);
-        if (account == null)
-        {
-            account = new CustomerAccount();
-            account.setCustomerId(receipt.getCustomerId());
-            account.setCurrency(BASE_CURRENCY);
-            account.setBalance(BigDecimal.ZERO);
-            account.setFrozenBalance(BigDecimal.ZERO);
-            account.setTotalCredit(BigDecimal.ZERO);
-            account.setExtraCredit(BigDecimal.ZERO);
-            account.setUsedCredit(BigDecimal.ZERO);
-            account.setTax(BigDecimal.ZERO);
-            account.setVersion(0);
-            account.setCreateBy(username);
-            customerMoneyMapper.insertAccount(account);
-        }
+        // 1. 行锁锁定客户本位币(CNY)账户，不存在则按客户档案额度自动初始化。无论收什么币种，一律折算 CNY 入账
+        CustomerAccount account = getOrInitCnyAccount(receipt.getCustomerId(), username);

        // 2. 本位币余额变动（预充值/混合增加余额；还款核销释放已用额度）
        BigDecimal beforeBalance = nz(account.getBalance());
@@ -191,12 +197,8 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
        BigDecimal frozenBalance = nz(account.getFrozenBalance());

        account.setBalance(afterBalance);
-        if (CustomerReceipt.TYPE_REPAY.equals(receipt.getReceiptType()))
-        {
-            account.setUsedCredit(nz(account.getUsedCredit()).subtract(baseAmount).max(BigDecimal.ZERO));
-        }
        account.setUpdateBy(username);
-
+        // 额度占用统一以账单为准：收款审核只增加余额，核销账单时才释放已用额度
        int accountRows = customerMoneyMapper.updateAccountBalance(account);
        if (accountRows == 0)
        {
@@ -260,6 +262,503 @@ public class CustomerMoneyServiceImpl implements ICustomerMoneyService
        return customerMoneyMapper.selectFlowList(query);
    }

+    @Override
+    public List<CustomerCreditFlow> selectCreditFlowList(CustomerCreditFlow query)
+    {
+        return customerMoneyMapper.selectCreditFlowList(query);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int adjustCredit(CustomerCreditFlow cmd)
+    {
+        if (cmd == null || cmd.getCustomerId() == null)
+        {
+            throw new ServiceException("客户ID不能为空");
+        }
+        Long customerId = cmd.getCustomerId();
+        String creditType = cmd.getCreditType();
+        if (!CustomerCreditFlow.CREDIT_TYPE_CREDIT.equals(creditType)
+                && !CustomerCreditFlow.CREDIT_TYPE_TEMP.equals(creditType))
+        {
+            throw new ServiceException("额度类型不正确");
+        }
+        String adjustMode = cmd.getAdjustMode();
+        if (!CustomerCreditFlow.MODE_SET.equals(adjustMode)
+                && !CustomerCreditFlow.MODE_ADD.equals(adjustMode)
+                && !CustomerCreditFlow.MODE_SUB.equals(adjustMode))
+        {
+            throw new ServiceException("调整方式不正确");
+        }
+        BigDecimal input = nz(cmd.getChangeAmount());
+        if (input.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            throw new ServiceException("调整金额必须大于0");
+        }
+        if (!StringUtils.hasText(cmd.getReason()))
+        {
+            throw new ServiceException("请填写调整原因");
+        }
+        String reason = cmd.getReason().trim();
+        if (reason.length() > 255)
+        {
+            throw new ServiceException("调整原因不能超过255个字");
+        }
+        String username = SecurityUtils.getUsername();
+        Long userId = SecurityUtils.getUserId();
+        boolean isTemp = CustomerCreditFlow.CREDIT_TYPE_TEMP.equals(creditType);
+
+        // 1. 行锁锁定CNY账户（不存在则按客户档案额度初始化创建）；先处理临时额度过期
+        CustomerAccount account = getOrInitCnyAccount(customerId, username);
+        expireTempCreditIfNeeded(account);
+
+        // 2. 计算调整结果
+        BigDecimal before = isTemp ? nz(account.getExtraCredit()) : nz(account.getTotalCredit());
+        BigDecimal otherCredit = isTemp ? nz(account.getTotalCredit()) : nz(account.getExtraCredit());
+        BigDecimal after;
+        switch (adjustMode)
+        {
+            case CustomerCreditFlow.MODE_SET:
+                after = input;
+                break;
+            case CustomerCreditFlow.MODE_ADD:
+                after = before.add(input);
+                break;
+            default:
+                after = before.subtract(input);
+                break;
+        }
+        after = after.setScale(MONEY_SCALE, RoundingMode.HALF_UP);
+        if (after.compareTo(BigDecimal.ZERO) < 0)
+        {
+            throw new ServiceException("调整后额度不能为负数");
+        }
+        if (otherCredit.add(after).compareTo(nz(account.getUsedCredit())) < 0)
+        {
+            throw new ServiceException("调整后授信总额度不能小于已用额度："
+                    + nz(account.getUsedCredit()).toPlainString());
+        }
+        if (after.compareTo(before) == 0)
+        {
+            throw new ServiceException("额度未发生变化，无需调整");
+        }
+
+        // 3. 临时额度有效期校验（不允许预约未来生效，失效日必须晚于生效日）
+        Date effectiveDate = null;
+        Date expireDate = null;
+        if (isTemp)
+        {
+            LocalDate today = LocalDate.now();
+            LocalDate eff = cmd.getEffectiveDate() != null ? toLocalDate(cmd.getEffectiveDate()) : today;
+            if (eff.isAfter(today))
+            {
+                throw new ServiceException("生效日期不能晚于今天，需要未来生效请在生效当天再设置");
+            }
+            effectiveDate = toSqlDate(eff);
+            if (cmd.getExpireDate() != null)
+            {
+                LocalDate exp = toLocalDate(cmd.getExpireDate());
+                if (!exp.isAfter(eff))
+                {
+                    throw new ServiceException("失效日期必须晚于生效日期");
+                }
+                expireDate = toSqlDate(exp);
+            }
+            account.setExtraCredit(after);
+            account.setExtraEffectiveDate(effectiveDate);
+            account.setExtraExpireDate(expireDate);
+        }
+        else
+        {
+            account.setTotalCredit(after);
+        }
+        account.setUpdateBy(username);
+
+        // 4. 乐观锁更新额度
+        int rows = customerMoneyMapper.updateAccountCredit(account);
+        if (rows == 0)
+        {
+            throw new ServiceException("账户额度已被其他操作变动，请刷新后重试");
+        }
+        account.setVersion(account.getVersion() + 1);
+
+        // 5. 回写客户档案额度字段（额度唯一数据源为账户，档案仅做同步展示）
+        bmsCustomerMapper.updateCustomerCredit(customerId,
+                nz(account.getTotalCredit()), nz(account.getExtraCredit()), username);
+
+        // 6. 写额度流水
+        CustomerCreditFlow flow = new CustomerCreditFlow();
+        flow.setFlowNo(generateNo("EDLS"));
+        flow.setCustomerId(customerId);
+        flow.setAccountId(account.getId());
+        flow.setCreditType(creditType);
+        flow.setChangeType(CustomerCreditFlow.CHANGE_ADJUST);
+        int direction = after.compareTo(before) > 0 ? 1 : -1;
+        flow.setDirection(direction);
+        flow.setBeforeAmount(before);
+        flow.setChangeAmount(after.subtract(before).abs());
+        flow.setAfterAmount(after);
+        flow.setUsedCredit(nz(account.getUsedCredit()));
+        flow.setEffectiveDate(effectiveDate);
+        flow.setExpireDate(expireDate);
+        flow.setReason(reason);
+        flow.setAdjustMode(adjustMode);
+        flow.setOperatorId(userId);
+        flow.setCreateBy(username);
+        flow.setRemark(cmd.getRemark());
+        flow.setDelFlag("0");
+        customerMoneyMapper.insertCreditFlow(flow);
+        return 1;
+    }
+
+    /* ================= 账单联动：额度占用 / 余额核销 ================= */
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void occupyCredit(Long customerId, String currency, BigDecimal amount)
+    {
+        if (customerId == null || amount == null || amount.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            return;
+        }
+        String ccny = StringUtils.hasText(currency) ? currency.trim().toUpperCase() : BASE_CURRENCY;
+        CustomerAccount account = lockAccountForBill(customerId, ccny, SecurityUtils.getUsername());
+        if (account == null)
+        {
+            return;
+        }
+        account.setUsedCredit(nz(account.getUsedCredit()).add(amount).setScale(MONEY_SCALE, RoundingMode.HALF_UP));
+        account.setUpdateBy(SecurityUtils.getUsername());
+        if (customerMoneyMapper.updateAccountBalance(account) == 0)
+        {
+            throw new ServiceException("账户已被其他操作变动，请刷新后重试");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void releaseCredit(Long customerId, String currency, BigDecimal amount)
+    {
+        if (customerId == null || amount == null || amount.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            return;
+        }
+        String ccny = StringUtils.hasText(currency) ? currency.trim().toUpperCase() : BASE_CURRENCY;
+        CustomerAccount account = lockAccountForBill(customerId, ccny, SecurityUtils.getUsername());
+        if (account == null)
+        {
+            return;
+        }
+        account.setUsedCredit(nz(account.getUsedCredit()).subtract(amount).max(BigDecimal.ZERO)
+                .setScale(MONEY_SCALE, RoundingMode.HALF_UP));
+        account.setUpdateBy(SecurityUtils.getUsername());
+        if (customerMoneyMapper.updateAccountBalance(account) == 0)
+        {
+            throw new ServiceException("账户已被其他操作变动，请刷新后重试");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CustomerBalanceFlow payBill(Long customerId, String currency, BigDecimal amount,
+            Long bizId, String bizNo, String remark)
+    {
+        if (customerId == null)
+        {
+            throw new ServiceException("客户ID不能为空");
+        }
+        if (amount == null || amount.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            throw new ServiceException("核销金额必须大于0");
+        }
+        String ccny = StringUtils.hasText(currency) ? currency.trim().toUpperCase() : BASE_CURRENCY;
+        String username = SecurityUtils.getUsername();
+        Long userId = SecurityUtils.getUserId();
+        CustomerAccount account = lockAccountForBill(customerId, ccny, username);
+        if (account == null)
+        {
+            throw new ServiceException("客户没有" + ccny + "账户，无法用余额核销");
+        }
+
+        BigDecimal beforeBalance = nz(account.getBalance());
+        if (beforeBalance.compareTo(amount) < 0)
+        {
+            throw new ServiceException("账户余额不足，当前" + ccny + "余额：" + beforeBalance.toPlainString());
+        }
+        BigDecimal afterBalance = beforeBalance.subtract(amount);
+        BigDecimal frozenBalance = nz(account.getFrozenBalance());
+        // 核销账单 = 应收被清偿，同步释放等额授信占用
+        account.setBalance(afterBalance);
+        account.setUsedCredit(nz(account.getUsedCredit()).subtract(amount).max(BigDecimal.ZERO)
+                .setScale(MONEY_SCALE, RoundingMode.HALF_UP));
+        account.setUpdateBy(username);
+        if (customerMoneyMapper.updateAccountBalance(account) == 0)
+        {
+            throw new ServiceException("账户余额已被其他操作变动，请刷新后重试");
+        }
+
+        CustomerBalanceFlow flow = newBalanceFlow(account, ccny, amount, -1,
+                beforeBalance, afterBalance, frozenBalance, frozenBalance,
+                bizId, bizNo, username, userId, remark);
+        customerMoneyMapper.insertFlow(flow);
+        return flow;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CustomerBalanceFlow reverseBillPay(Long customerId, String currency, BigDecimal amount,
+            Long bizId, String bizNo, String remark)
+    {
+        if (customerId == null || amount == null || amount.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            throw new ServiceException("反核销金额不正确");
+        }
+        String ccny = StringUtils.hasText(currency) ? currency.trim().toUpperCase() : BASE_CURRENCY;
+        String username = SecurityUtils.getUsername();
+        Long userId = SecurityUtils.getUserId();
+        CustomerAccount account = lockAccountForBill(customerId, ccny, username);
+        if (account == null)
+        {
+            throw new ServiceException("客户" + ccny + "账户不存在，无法反核销");
+        }
+
+        BigDecimal beforeBalance = nz(account.getBalance());
+        BigDecimal afterBalance = beforeBalance.add(amount);
+        BigDecimal frozenBalance = nz(account.getFrozenBalance());
+        // 账单恢复为未核销，授信占用同步加回（允许与存量数据一样出现超出总额度的占用状态）
+        account.setBalance(afterBalance);
+        account.setUsedCredit(nz(account.getUsedCredit()).add(amount).setScale(MONEY_SCALE, RoundingMode.HALF_UP));
+        account.setUpdateBy(username);
+        if (customerMoneyMapper.updateAccountBalance(account) == 0)
+        {
+            throw new ServiceException("账户余额已被其他操作变动，请刷新后重试");
+        }
+
+        CustomerBalanceFlow flow = newBalanceFlow(account, ccny, amount, 1,
+                beforeBalance, afterBalance, frozenBalance, frozenBalance,
+                bizId, bizNo, username, userId, remark);
+        customerMoneyMapper.insertFlow(flow);
+        return flow;
+    }
+
+    /** 账单联动场景锁定账户：CNY不存在则初始化（先处理临时额度过期），外币账户不存在返回null */
+    private CustomerAccount lockAccountForBill(Long customerId, String currency, String username)
+    {
+        if (BASE_CURRENCY.equals(currency))
+        {
+            CustomerAccount account = getOrInitCnyAccount(customerId, username);
+            expireTempCreditIfNeeded(account);
+            return account;
+        }
+        return customerMoneyMapper.selectAccountForUpdate(customerId, currency);
+    }
+
+    private CustomerBalanceFlow newBalanceFlow(CustomerAccount account, String currency, BigDecimal amount,
+            int direction, BigDecimal beforeBalance, BigDecimal afterBalance,
+            BigDecimal beforeFrozen, BigDecimal afterFrozen,
+            Long bizId, String bizNo, String username, Long userId, String remark)
+    {
+        CustomerBalanceFlow flow = new CustomerBalanceFlow();
+        flow.setFlowNo(generateNo("LS"));
+        flow.setCustomerId(account.getCustomerId());
+        flow.setAccountId(account.getId());
+        flow.setCurrency(currency);
+        flow.setExchangeRate(BigDecimal.ONE);
+        flow.setBaseAmount(amount);
+        flow.setBizType(CustomerBalanceFlow.BIZ_BILL_PAY);
+        flow.setBizId(bizId);
+        flow.setBizNo(bizNo);
+        flow.setDirection(direction);
+        flow.setAmount(amount);
+        flow.setBeforeBalance(beforeBalance);
+        flow.setAfterBalance(afterBalance);
+        flow.setBeforeFrozenBalance(beforeFrozen);
+        flow.setAfterFrozenBalance(afterFrozen);
+        flow.setOperatorId(userId);
+        flow.setCreateBy(username);
+        flow.setRemark(remark);
+        return flow;
+    }
+
+    /* ================= 额度私有方法 ================= */
+
+    /**
+     * 新建客户时默认初始化CNY账户：余额0，总额度默认1000 CNY
+     * （客户档案已填信用额度且大于0时按档案值），并写 INIT 流水；已存在则跳过。
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int initDefaultCnyAccount(Long customerId)
+    {
+        if (customerId == null)
+        {
+            throw new ServiceException("客户ID不能为空");
+        }
+        String username = SecurityUtils.getUsername();
+        CustomerAccount account = customerMoneyMapper.selectAccountForUpdate(customerId, BASE_CURRENCY);
+        if (account != null)
+        {
+            return 1;
+        }
+        BmsCustomer customer = bmsCustomerMapper.selectRawCreditByCustomerId(customerId);
+        if (customer == null)
+        {
+            throw new ServiceException("客户不存在");
+        }
+        BigDecimal initCredit = nz(customer.getCreditEd());
+        if (initCredit.compareTo(BigDecimal.ZERO) <= 0)
+        {
+            initCredit = DEFAULT_CREDIT;
+        }
+        BigDecimal initTemp = nz(customer.getTempEd());
+        account = createCnyAccount(customerId, initCredit, initTemp, username);
+        // 档案额度与实际初始额度保持一致
+        bmsCustomerMapper.updateCustomerCredit(customerId, initCredit, initTemp, username);
+        writeInitFlow(account, CustomerCreditFlow.CREDIT_TYPE_CREDIT,
+                initCredit, null, null, username, "新客户默认初始化额度1000 CNY");
+        if (initTemp.compareTo(BigDecimal.ZERO) > 0)
+        {
+            writeInitFlow(account, CustomerCreditFlow.CREDIT_TYPE_TEMP,
+                    initTemp, null, null, username, "新客户初始化临时额度");
+        }
+        return 1;
+    }
+
+    /** 行锁获取客户CNY账户，不存在则按客户档案当前额度初始化创建 */
+    private CustomerAccount getOrInitCnyAccount(Long customerId, String username)
+    {
+        CustomerAccount account = customerMoneyMapper.selectAccountForUpdate(customerId, BASE_CURRENCY);
+        if (account == null)
+        {
+            BmsCustomer customer = bmsCustomerMapper.selectRawCreditByCustomerId(customerId);
+            if (customer == null)
+            {
+                throw new ServiceException("客户不存在");
+            }
+            BigDecimal initCredit = nz(customer.getCreditEd());
+            BigDecimal initTemp = nz(customer.getTempEd());
+            account = createCnyAccount(customerId, initCredit, initTemp, username);
+            writeInitFlow(account, CustomerCreditFlow.CREDIT_TYPE_CREDIT,
+                    initCredit, null, null, username, "首次创建CNY账户，从客户档案同步初始额度");
+            if (initTemp.compareTo(BigDecimal.ZERO) > 0)
+            {
+                writeInitFlow(account, CustomerCreditFlow.CREDIT_TYPE_TEMP,
+                        initTemp, null, null, username, "首次创建CNY账户，从客户档案同步临时额度");
+            }
+        }
+        return account;
+    }
+
+    /** 创建CNY账户（余额0，已用0） */
+    private CustomerAccount createCnyAccount(Long customerId, BigDecimal totalCredit,
+            BigDecimal extraCredit, String username)
+    {
+        CustomerAccount account = new CustomerAccount();
+        account.setCustomerId(customerId);
+        account.setCurrency(BASE_CURRENCY);
+        account.setBalance(BigDecimal.ZERO);
+        account.setFrozenBalance(BigDecimal.ZERO);
+        account.setTotalCredit(totalCredit);
+        account.setExtraCredit(extraCredit);
+        account.setUsedCredit(BigDecimal.ZERO);
+        account.setTax(BigDecimal.ZERO);
+        account.setVersion(0);
+        account.setCreateBy(username);
+        customerMoneyMapper.insertAccount(account);
+        return account;
+    }
+
+    /**
+     * 账户首次初始化时写额度 INIT 流水（从客户档案额度同步）
+     */
+    private void writeInitFlow(CustomerAccount account, String creditType,
+            BigDecimal initAmount, Date effectiveDate, Date expireDate,
+            String username, String remark)
+    {
+        CustomerCreditFlow flow = new CustomerCreditFlow();
+        flow.setFlowNo(generateNo("EDLS"));
+        flow.setCustomerId(account.getCustomerId());
+        flow.setAccountId(account.getId());
+        flow.setCreditType(creditType);
+        flow.setChangeType(CustomerCreditFlow.CHANGE_INIT);
+        flow.setDirection(initAmount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
+        flow.setBeforeAmount(BigDecimal.ZERO);
+        flow.setChangeAmount(initAmount);
+        flow.setAfterAmount(initAmount);
+        flow.setUsedCredit(nz(account.getUsedCredit()));
+        flow.setEffectiveDate(effectiveDate);
+        flow.setExpireDate(expireDate);
+        flow.setReason("账户初始化");
+        flow.setOperatorId(SecurityUtils.getUserId());
+        flow.setCreateBy(username);
+        flow.setRemark(remark);
+        flow.setDelFlag("0");
+        customerMoneyMapper.insertCreditFlow(flow);
+    }
+
+    /** 临时额度是否已过期：有失效日期且今天已晚于失效日（失效日当天仍有效） */
+    private boolean isTempCreditExpired(CustomerAccount account)
+    {
+        return account != null
+                && nz(account.getExtraCredit()).compareTo(BigDecimal.ZERO) > 0
+                && account.getExtraExpireDate() != null
+                && LocalDate.now().isAfter(toLocalDate(account.getExtraExpireDate()));
+    }
+
+    /**
+     * 临时额度到期自动失效：额度清零 -> 回写客户档案 -> 写EXPIRE流水。
+     * 入参必须是事务内行锁查出的账户。
+     */
+    private void expireTempCreditIfNeeded(CustomerAccount account)
+    {
+        if (account == null || !isTempCreditExpired(account))
+        {
+            return;
+        }
+        String username = SecurityUtils.getUsername();
+        BigDecimal before = nz(account.getExtraCredit());
+        account.setExtraCredit(BigDecimal.ZERO);
+        account.setUpdateBy(username);
+        int rows = customerMoneyMapper.updateAccountCredit(account);
+        if (rows == 0)
+        {
+            throw new ServiceException("账户额度已被其他操作变动，请刷新后重试");
+        }
+        account.setVersion(account.getVersion() + 1);
+        bmsCustomerMapper.updateCustomerCredit(account.getCustomerId(),
+                nz(account.getTotalCredit()), BigDecimal.ZERO, username);
+
+        CustomerCreditFlow flow = new CustomerCreditFlow();
+        flow.setFlowNo(generateNo("EDLS"));
+        flow.setCustomerId(account.getCustomerId());
+        flow.setAccountId(account.getId());
+        flow.setCreditType(CustomerCreditFlow.CREDIT_TYPE_TEMP);
+        flow.setChangeType(CustomerCreditFlow.CHANGE_EXPIRE);
+        flow.setDirection(-1);
+        flow.setBeforeAmount(before);
+        flow.setChangeAmount(before);
+        flow.setAfterAmount(BigDecimal.ZERO);
+        flow.setUsedCredit(nz(account.getUsedCredit()));
+        flow.setEffectiveDate(account.getExtraEffectiveDate());
+        flow.setExpireDate(account.getExtraExpireDate());
+        flow.setReason("临时额度到期自动失效");
+        flow.setOperatorId(SecurityUtils.getUserId());
+        flow.setCreateBy(username);
+        flow.setRemark("系统在访问账户时检测到临时额度已过失效日期，自动置零");
+        flow.setDelFlag("0");
+        customerMoneyMapper.insertCreditFlow(flow);
+    }
+
+    private LocalDate toLocalDate(Date date)
+    {
+        return date.toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate();
+    }
+
+    private Date toSqlDate(LocalDate localDate)
+    {
+        return java.sql.Date.valueOf(localDate);
+    }
+
    /* ================= 私有方法 ================= */

    /** 保存收款附件到客户附件表 */
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ar.mapper.ArBalanceWriteoffMapper">
+
+    <resultMap id="ArBalanceWriteoffResult" type="ArBalanceWriteoff">
+        <id     property="writeoffId"      column="writeoff_id"/>
+        <result property="writeoffNo"      column="writeoff_no"/>
+        <result property="arBillId"        column="ar_bill_id"/>
+        <result property="billNo"          column="bill_no"/>
+        <result property="customerId"      column="customer_id"/>
+        <result property="accountId"       column="account_id"/>
+        <result property="currency"        column="currency"/>
+        <result property="writeoffAmount"  column="writeoff_amount"/>
+        <result property="balanceFlowId"   column="balance_flow_id"/>
+        <result property="reverseFlowId"   column="reverse_flow_id"/>
+        <result property="writeoffDate"    column="writeoff_date"/>
+        <result property="status"          column="status"/>
+        <result property="remark"          column="remark"/>
+        <result property="createBy"        column="create_by"/>
+        <result property="createTime"      column="create_time"/>
+        <result property="cancelBy"        column="cancel_by"/>
+        <result property="cancelTime"      column="cancel_time"/>
+        <result property="cancelRemark"    column="cancel_remark"/>
+        <result property="billName"        column="bill_name"/>
+        <result property="customerName"    column="customer_name"/>
+    </resultMap>
+
+    <sql id="selectColumns">
+        select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.account_id,
+               w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id,
+               w.writeoff_date, w.status, w.remark, w.create_by, w.create_time,
+               w.cancel_by, w.cancel_time, w.cancel_remark,
+               b.bill_name, b.customer_name
+        from ar_balance_writeoff w
+        left join ar_bill b on b.ar_bill_id = w.ar_bill_id
+    </sql>
+
+    <insert id="insertArBalanceWriteoff" parameterType="ArBalanceWriteoff"
+            useGeneratedKeys="true" keyProperty="writeoffId">
+        insert into ar_balance_writeoff (
+            writeoff_no, ar_bill_id, bill_no, customer_id, account_id, currency,
+            writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date,
+            status, remark, create_by, create_time
+        ) values (
+            #{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{accountId}, #{currency},
+            #{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate},
+            #{status}, #{remark}, #{createBy}, sysdate()
+        )
+    </insert>
+
+    <update id="updateFlowRefs">
+        update ar_balance_writeoff
+        set account_id = #{accountId},
+            balance_flow_id = #{balanceFlowId}
+        where writeoff_id = #{writeoffId}
+    </update>
+
+    <select id="selectByIdForUpdate" resultMap="ArBalanceWriteoffResult">
+        <include refid="selectColumns"/>
+        where w.writeoff_id = #{writeoffId}
+        for update
+    </select>
+
+    <update id="updateCancelled">
+        update ar_balance_writeoff
+        set status = 'CANCELLED',
+            reverse_flow_id = #{reverseFlowId},
+            cancel_by = #{cancelBy},
+            cancel_time = sysdate(),
+            cancel_remark = #{cancelRemark}
+        where writeoff_id = #{writeoffId} and status = 'EFFECTIVE'
+    </update>
+
+    <select id="selectWriteoffList" parameterType="ArBalanceWriteoff" resultMap="ArBalanceWriteoffResult">
+        <include refid="selectColumns"/>
+        <where>
+            <if test="customerId != null">and w.customer_id = #{customerId}</if>
+            <if test="arBillId != null">and w.ar_bill_id = #{arBillId}</if>
+            <if test="status != null and status != ''">and w.status = #{status}</if>
+            <if test="currency != null and currency != ''">and w.currency = #{currency}</if>
+            <if test="writeoffNo != null and writeoffNo != ''">and w.writeoff_no like concat('%', #{writeoffNo}, '%')</if>
+            <if test="billNo != null and billNo != ''">and w.bill_no like concat('%', #{billNo}, '%')</if>
+        </where>
+        order by w.create_time desc, w.writeoff_id desc
+    </select>
+</mapper>
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <resultMap id="ArBillDetailFeeResult" type="ArBillDetailFee">
        <id property="detailFeeId" column="detail_fee_id"/>
        <result property="detailId" column="detail_id"/>
-        <result property="prcFeeId" column="prc_fee_id"/>
+        <result property="prcIncomeBillFeeId" column="prc_income_bill_fee_id"/>
        <result property="feeNo" column="fee_no"/>
        <result property="feeType" column="fee_type"/>
        <result property="feeName" column="fee_name"/>
@@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <select id="selectByDetailId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
               unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
        from ar_bill_detail_fee where detail_id = #{detailId} order by fee_no, detail_fee_id
    </select>

    <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
               unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
        from ar_bill_detail_fee
        where detail_id in (select detail_id from ar_bill_detail where ar_bill_id = #{arBillId})
@@ -39,10 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insert" parameterType="ArBillDetailFee" useGeneratedKeys="true" keyProperty="detailFeeId">
        insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
            amount, currency, calculation_formula, round_mode, remark, create_by, create_time
        ) values (
-            #{detailId}, #{prcFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
+            #{detailId}, #{prcIncomeBillFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
            #{unitPrice}, #{amount}, #{currency}, #{calculationFormula}, #{roundMode}, #{remark},
            #{createBy}, sysdate()
        )
@@ -50,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailFeeId">
        insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
            amount, currency, calculation_formula, round_mode, remark, create_by, create_time
        ) values
        <foreach collection="list" item="item" separator=",">
-            (#{item.detailId}, #{item.prcFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
+            (#{item.detailId}, #{item.prcIncomeBillFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
             #{item.quantity}, #{item.unit}, #{item.unitPrice}, #{item.amount}, #{item.currency},
             #{item.calculationFormula}, #{item.roundMode}, #{item.remark}, #{item.createBy}, sysdate())
        </foreach>
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <resultMap id="ArBillDetailResult" type="ArBillDetail">
        <id property="detailId" column="detail_id"/>
        <result property="arBillId" column="ar_bill_id"/>
-        <result property="prcBillId" column="prc_bill_id"/>
+        <result property="prcOrderBillId" column="prc_order_bill_id"/>
        <result property="detailNo" column="detail_no"/>
        <result property="orderNo" column="order_no"/>
        <result property="trackingNo" column="tracking_no"/>
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailResult">
-        select detail_id, ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time,
+        select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time,
               product_code, product_name, goods_description, country_code, country_name, dest_postcode,
               actual_weight, volume_weight, charge_weight, pkg_length, pkg_width, pkg_height,
               currency, total_amount, remark, create_by, create_time
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <collection property="fees" ofType="ArBillDetailFee">
            <id property="detailFeeId" column="fee_detail_id"/>
            <result property="detailId" column="fee_parent_detail_id"/>
-            <result property="prcFeeId" column="fee_prc_fee_id"/>
+            <result property="prcIncomeBillFeeId" column="fee_prc_income_bill_fee_id"/>
            <result property="feeNo" column="fee_no"/>
            <result property="feeType" column="fee_type"/>
            <result property="feeName" column="fee_name"/>
@@ -61,11 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <select id="selectByBillIdWithFees" parameterType="long" resultMap="ArBillDetailWithFeesResult">
-        select d.detail_id, d.ar_bill_id, d.prc_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
+        select d.detail_id, d.ar_bill_id, d.prc_order_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
               d.product_code, d.product_name, d.goods_description, d.country_code, d.country_name, d.dest_postcode,
               d.actual_weight, d.volume_weight, d.charge_weight, d.pkg_length, d.pkg_width, d.pkg_height,
               d.currency, d.total_amount, d.remark, d.create_by, d.create_time,
-               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id, f.prc_fee_id as fee_prc_fee_id,
+               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id,
+               f.prc_income_bill_fee_id as fee_prc_income_bill_fee_id,
               f.fee_no, f.fee_type, f.fee_name, f.sc_id as fee_sc_id, f.quantity as fee_quantity,
               f.unit as fee_unit, f.unit_price as fee_unit_price, f.amount as fee_amount,
               f.currency as fee_currency, f.calculation_formula as fee_calculation_formula,
@@ -79,12 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insert" parameterType="ArBillDetail" useGeneratedKeys="true" keyProperty="detailId">
        insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
            product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
            volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
            remark, create_by, create_time
        ) values (
-            #{arBillId}, #{prcBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
+            #{arBillId}, #{prcOrderBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
            #{productCode}, #{productName}, #{goodsDescription}, #{countryCode}, #{countryName},
            #{destPostcode}, #{actualWeight}, #{volumeWeight}, #{chargeWeight}, #{pkgLength}, #{pkgWidth},
            #{pkgHeight}, #{currency}, #{totalAmount}, #{remark}, #{createBy}, sysdate()
@@ -93,13 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailId">
        insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
            product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
            volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
            remark, create_by, create_time
        ) values
        <foreach collection="list" item="item" separator=",">
-            (#{item.arBillId}, #{item.prcBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
+            (#{item.arBillId}, #{item.prcOrderBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
             #{item.receiveTime}, #{item.productCode}, #{item.productName}, #{item.goodsDescription},
             #{item.countryCode}, #{item.countryName}, #{item.destPostcode}, #{item.actualWeight},
             #{item.volumeWeight}, #{item.chargeWeight}, #{item.pkgLength}, #{item.pkgWidth}, #{item.pkgHeight},
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        from ar_bill
    </sql>

-    <select id="selectArBillList" parameterType="ArBill" resultMap="ArBillResult">
+    <select id="selectArBillList" parameterType="com.ruoyi.ar.domain.vo.ArBillQuery" resultMap="ArBillResult">
        <include refid="selectArBillColumns"/>
        <where>
            <if test="billNo != null and billNo != ''">and bill_no like concat('%', #{billNo}, '%')</if>
@@ -51,8 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="customerId != null">and customer_id = #{customerId}</if>
            <if test="status != null and status != ''">and status = #{status}</if>
            <if test="currency != null and currency != ''">and currency = #{currency}</if>
-            <if test="billPeriodStart != null">and bill_period_end &gt;= #{billPeriodStart}</if>
-            <if test="billPeriodEnd != null">and bill_period_start &lt;= #{billPeriodEnd}</if>
+            <if test="billDateStart != null">and bill_date &gt;= #{billDateStart}</if>
+            <if test="billDateEnd != null">and bill_date &lt;= #{billDateEnd}</if>
+            <if test="billPeriodEnd != null">and bill_period_end = #{billPeriodEnd}</if>
        </where>
        order by create_time desc, ar_bill_id desc
    </select>
@@ -80,6 +81,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectArBillColumns"/> where ar_bill_id = #{arBillId} for update
    </select>

+    <select id="selectUnsettledByCustomer" resultMap="ArBillResult">
+        <include refid="selectArBillColumns"/>
+        where customer_id = #{customerId}
+          and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF')
+          and unwritten_amount &gt; 0
+        order by bill_date asc, ar_bill_id asc
+    </select>
+
    <insert id="insertArBill" parameterType="ArBill" useGeneratedKeys="true" keyProperty="arBillId">
        insert into ar_bill (
            bill_no, bill_name, customer_id, customer_code, customer_name, bill_period_start, bill_period_end,
@@ -198,6 +198,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          and (biz_type = 'customer' or biz_type is null or biz_type = '')
    </update>

+    <!-- 额度调整后回写客户档案额度字段（数据源为客户余额账户） -->
+    <update id="updateCustomerCredit">
+        update bms_customer
+        set credit_ed = #{creditEd},
+            temp_ed = #{tempEd},
+            update_by = #{updateBy},
+            update_time = now()
+        where customer_id = #{customerId}
+    </update>
+
+    <!-- 只取档案物理额度列（列表查询里的 credit_ed 是账户可用额度子查询） -->
+    <select id="selectRawCreditByCustomerId" resultType="BmsCustomer">
+        select customer_id as customerId,
+               credit_ed as creditEd,
+               temp_ed as tempEd
+        from bms_customer
+        where customer_id = #{customerId}
+    </select>
+
    <delete id="deleteBmsCustomerAttachmentByAttachmentIds" parameterType="String">
        update bms_customer_attachment set del_flag = '2' where attachment_id in
        <foreach item="attachmentId" collection="attachmentIds" open="(" separator="," close=")">
@@ -287,12 +306,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            service_user_id = #{serviceUserId},
            service_user = #{serviceUser},
            <if test="settlementType != null">settlement_type = #{settlementType},</if>
-            <if test="tempEd != null">temp_ed = #{tempEd},</if>
            <if test="accountBalance != null">account_balance = #{accountBalance},</if>
            <if test="foreignCurrencyBalance != null">foreign_currency_balance = #{foreignCurrencyBalance},</if>
            <if test="weightThreshold != null">weight_threshold = #{weightThreshold},</if>
            <if test="throwRatio != null">throw_ratio = #{throwRatio},</if>
-            <if test="creditEd != null">credit_ed = #{creditEd},</if>
            <if test="productIds != null">product_ids = #{productIds},</if>
            <if test="remark != null">remark = #{remark},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.customer.customerinfo.mapper.BmsCustomerPriceSetMapper">
+
+    <resultMap type="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet" id="BmsCustomerPriceSetResult">
+        <id     property="customerPricesetId" column="customer_priceset_id" />
+        <result property="priceSetId"          column="price_set_id"          />
+        <result property="customerId"          column="customer_id"           />
+        <result property="customerCode"        column="customer_code"         />
+        <result property="customerName"        column="customer_name"         />
+        <result property="bindPriority"        column="bind_priority"         />
+        <result property="prBegindate"         column="pr_begindate"          />
+        <result property="prEnddate"           column="pr_enddate"            />
+        <result property="priceSetNote"        column="price_set_note"        />
+        <result property="createBy"            column="created_by"            />
+        <result property="createTime"          column="create_time"           />
+        <result property="updateBy"            column="updated_by"            />
+        <result property="updateTime"          column="update_time"           />
+        <result property="priceSetCode"        column="price_set_code"        />
+        <result property="priceSetName"        column="price_set_name"        />
+        <result property="setType"             column="set_type"              />
+        <result property="priceSetStatus"      column="price_set_status"      />
+        <result property="setEffectiveDate"    column="set_effective_date"    />
+        <result property="setExpireDate"       column="set_expire_date"       />
+    </resultMap>
+
+    <resultMap type="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption" id="BmsPriceSetOptionResult">
+        <id     property="priceSetId"    column="price_set_id"    />
+        <result property="priceSetCode"  column="price_set_code"  />
+        <result property="priceSetName"  column="price_set_name"  />
+        <result property="setType"       column="set_type"        />
+        <result property="status"        column="status"          />
+        <result property="effectiveDate" column="effective_date"  />
+        <result property="expireDate"    column="expire_date"     />
+    </resultMap>
+
+    <sql id="bindVo">
+        select c.customer_priceset_id, c.price_set_id, c.customer_id, c.customer_code, c.customer_name,
+               c.bind_priority, c.pr_begindate, c.pr_enddate, c.price_set_note,
+               c.created_by, c.create_time, c.updated_by, c.update_time,
+               s.price_set_code, s.price_set_name, s.set_type,
+               s.status as price_set_status,
+               s.effective_date as set_effective_date, s.expire_date as set_expire_date
+        from prc_customer_price_set c
+        left join prc_price_set s on s.price_set_id = c.price_set_id
+    </sql>
+
+    <select id="selectBindListByCustomerId" resultMap="BmsCustomerPriceSetResult">
+        <include refid="bindVo"/>
+        where c.customer_id = #{customerId}
+        order by c.bind_priority asc, c.customer_priceset_id asc
+    </select>
+
+    <select id="selectBindById" parameterType="Long" resultMap="BmsCustomerPriceSetResult">
+        <include refid="bindVo"/>
+        where c.customer_priceset_id = #{customerPricesetId}
+    </select>
+
+    <select id="selectBindByCustomerId" resultMap="BmsCustomerPriceSetResult">
+        select customer_priceset_id, price_set_id, customer_id, customer_code, customer_name,
+               bind_priority, pr_begindate, pr_enddate, price_set_note,
+               created_by, create_time, updated_by, update_time
+        from prc_customer_price_set
+        where customer_id = #{customerId}
+        limit 1
+    </select>
+
+    <insert id="insertBind" parameterType="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet"
+            useGeneratedKeys="true" keyProperty="customerPricesetId">
+        insert into prc_customer_price_set (
+            price_set_id, customer_id, customer_code, customer_name,
+            bind_priority, pr_begindate, pr_enddate, price_set_note,
+            created_by, create_time
+        ) values (
+            #{priceSetId}, #{customerId}, #{customerCode}, #{customerName},
+            #{bindPriority}, #{prBegindate}, #{prEnddate}, #{priceSetNote},
+            #{createBy}, sysdate()
+        )
+    </insert>
+
+    <update id="updateBind" parameterType="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet">
+        update prc_customer_price_set
+        set price_set_id   = #{priceSetId},
+            customer_code  = #{customerCode},
+            customer_name  = #{customerName},
+            bind_priority  = #{bindPriority},
+            pr_begindate   = #{prBegindate},
+            pr_enddate     = #{prEnddate},
+            price_set_note = #{priceSetNote},
+            updated_by     = #{updateBy},
+            update_time    = sysdate()
+        where customer_priceset_id = #{customerPricesetId}
+    </update>
+
+    <delete id="deleteBindByIds" parameterType="Long">
+        delete from prc_customer_price_set where customer_priceset_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="selectPriceSetOptionList"
+            parameterType="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption"
+            resultMap="BmsPriceSetOptionResult">
+        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        from prc_price_set
+        <where>
+            status = 'E'
+            <if test="setType != null and setType != ''">
+                and set_type = #{setType}
+            </if>
+            <if test="keyword != null and keyword != ''">
+                and (price_set_code like concat('%', #{keyword}, '%')
+                     or price_set_name like concat('%', #{keyword}, '%'))
+            </if>
+        </where>
+        order by price_set_id desc
+    </select>
+
+    <select id="selectPriceSetOptionById" resultMap="BmsPriceSetOptionResult">
+        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        from prc_price_set
+        where price_set_id = #{priceSetId}
+    </select>
+
+</mapper>
@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="frozenBalance" column="frozen_balance" />
        <result property="totalCredit"   column="total_credit"   />
        <result property="extraCredit"   column="extra_credit"   />
+        <result property="extraEffectiveDate" column="extra_effective_date" />
+        <result property="extraExpireDate" column="extra_expire_date" />
        <result property="usedCredit"    column="used_credit"    />
        <result property="tax"           column="tax"            />
        <result property="version"       column="version"        />
@@ -25,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </resultMap>

    <sql id="selectCustomerAccountVo">
-        select id, customer_id, currency, balance, frozen_balance, total_credit, extra_credit, used_credit,
+        select id, customer_id, currency, balance, frozen_balance, total_credit, extra_credit,
+               extra_effective_date, extra_expire_date, used_credit,
               tax, version, create_by, create_time, update_by, update_time, remark, del_flag
        from customer_account
    </sql>
@@ -90,6 +93,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        where id = #{id} and version = #{version} and del_flag = '0'
    </update>

+    <!-- 乐观锁更新额度（信用/临时额度及临时额度有效期） -->
+    <update id="updateAccountCredit">
+        update customer_account
+        set total_credit         = #{totalCredit},
+            extra_credit         = #{extraCredit},
+            extra_effective_date  = #{extraEffectiveDate},
+            extra_expire_date   = #{extraExpireDate},
+            version              = version + 1,
+            update_by            = #{updateBy},
+            update_time          = now()
+        where id = #{id} and version = #{version} and del_flag = '0'
+    </update>
+
+    <!-- ================= 客户额度流水 ================= -->
+    <resultMap type="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow" id="CustomerCreditFlowResult">
+        <id     property="id"           column="id"            />
+        <result property="flowNo"       column="flow_no"       />
+        <result property="customerId"   column="customer_id"    />
+        <result property="accountId"    column="account_id"      />
+        <result property="creditType"   column="credit_type"     />
+        <result property="changeType"    column="change_type"     />
+        <result property="direction"     column="direction"       />
+        <result property="beforeAmount"  column="before_amount"  />
+        <result property="changeAmount"  column="change_amount"  />
+        <result property="afterAmount"   column="after_amount"   />
+        <result property="usedCredit"    column="used_credit"     />
+        <result property="effectiveDate" column="effective_date"  />
+        <result property="expireDate"    column="expire_date"     />
+        <result property="reason"       column="reason"          />
+        <result property="adjustMode"   column="adjust_mode"     />
+        <result property="operatorId"    column="operator_id"      />
+        <result property="createBy"      column="create_by"       />
+        <result property="createTime"    column="create_time"     />
+        <result property="updateBy"      column="update_by"       />
+        <result property="updateTime"    column="update_time"     />
+        <result property="remark"        column="remark"         />
+        <result property="delFlag"       column="del_flag"        />
+    </resultMap>
+
+    <sql id="selectCustomerCreditFlowVo">
+        select id, flow_no, customer_id, account_id, credit_type, change_type, direction,
+               before_amount, change_amount, after_amount, used_credit,
+               effective_date, expire_date, reason, adjust_mode, operator_id,
+               create_by, create_time, update_by, update_time, remark, del_flag
+        from customer_credit_flow
+    </sql>
+
+    <select id="selectCreditFlowList" parameterType="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow"
+            resultMap="CustomerCreditFlowResult">
+        <include refid="selectCustomerCreditFlowVo"/>
+        <where>
+            <if test="customerId != null"> and customer_id = #{customerId}</if>
+            <if test="creditType != null and creditType != ''"> and credit_type = #{creditType}</if>
+            <if test="changeType != null and changeType != ''"> and change_type = #{changeType}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and date(create_time) &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and date(create_time) &lt;= #{params.endTime}</if>
+            and del_flag = '0'
+        </where>
+        order by create_time desc, id desc
+    </select>
+
+    <insert id="insertCreditFlow" parameterType="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into customer_credit_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="flowNo != null">flow_no,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="accountId != null">account_id,</if>
+            <if test="creditType != null">credit_type,</if>
+            <if test="changeType != null">change_type,</if>
+            <if test="direction != null">direction,</if>
+            <if test="beforeAmount != null">before_amount,</if>
+            <if test="changeAmount != null">change_amount,</if>
+            <if test="afterAmount != null">after_amount,</if>
+            <if test="usedCredit != null">used_credit,</if>
+            <if test="effectiveDate != null">effective_date,</if>
+            <if test="expireDate != null">expire_date,</if>
+            <if test="reason != null">reason,</if>
+            <if test="adjustMode != null">adjust_mode,</if>
+            <if test="operatorId != null">operator_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="flowNo != null">#{flowNo},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="accountId != null">#{accountId},</if>
+            <if test="creditType != null">#{creditType},</if>
+            <if test="changeType != null">#{changeType},</if>
+            <if test="direction != null">#{direction},</if>
+            <if test="beforeAmount != null">#{beforeAmount},</if>
+            <if test="changeAmount != null">#{changeAmount},</if>
+            <if test="afterAmount != null">#{afterAmount},</if>
+            <if test="usedCredit != null">#{usedCredit},</if>
+            <if test="effectiveDate != null">#{effectiveDate},</if>
+            <if test="expireDate != null">#{expireDate},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="adjustMode != null">#{adjustMode},</if>
+            <if test="operatorId != null">#{operatorId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
    <!-- ================= 客户收款 ================= -->
    <resultMap type="com.ruoyi.customer.customermoney.domain.CustomerReceipt" id="CustomerReceiptResult">
        <id     property="id"                  column="id"                    />
@@ -0,0 +1,75 @@
+-- =====================================================================
+-- 客户余额核销应收账单 V1.0  2026-09-16
+-- 1) 余额核销单表 ar_balance_writeoff（资金来源：customer_account.balance）
+-- 2) 存量账单未核销金额重算 customer_account.used_credit 占用
+-- 3) 菜单与授权：客户账单(2435) / 账单详情(2436) / 余额核销(2437) / 反核销(2438)
+-- =====================================================================
+
+-- 余额核销单：用客户账户余额核销应收账单（与 ar_receipt_writeoff 收款核销并列，
+-- 两者共享 ar_bill.written_off_amount / unwritten_amount 缓存字段）
+CREATE TABLE IF NOT EXISTS ar_balance_writeoff (
+  writeoff_id        BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '余额核销ID',
+  writeoff_no        VARCHAR(50) NOT NULL COMMENT '核销单号(BWO开头)',
+  ar_bill_id         BIGINT(20) NOT NULL COMMENT '应收账单ID',
+  bill_no            VARCHAR(50) NOT NULL COMMENT '账单号快照',
+  customer_id        BIGINT(20) NOT NULL COMMENT '客户ID',
+  account_id         BIGINT(20) DEFAULT NULL COMMENT '客户账户ID',
+  currency           VARCHAR(10) NOT NULL DEFAULT 'CNY' COMMENT '币种',
+  writeoff_amount    DECIMAL(18,2) NOT NULL DEFAULT 0.00 COMMENT '本次核销金额',
+  balance_flow_id    BIGINT(20) DEFAULT NULL COMMENT '核销扣余额流水ID',
+  reverse_flow_id    BIGINT(20) DEFAULT NULL COMMENT '反核销回补余额流水ID',
+  writeoff_date      DATE NOT NULL COMMENT '核销日期',
+  status             VARCHAR(30) NOT NULL COMMENT 'EFFECTIVE/CANCELLED',
+  remark             VARCHAR(500) DEFAULT NULL COMMENT '核销备注',
+  create_by          VARCHAR(64) NOT NULL COMMENT '创建人',
+  create_time        DATETIME NOT NULL COMMENT '创建时间',
+  cancel_by          VARCHAR(64) DEFAULT NULL COMMENT '反核销人',
+  cancel_time        DATETIME DEFAULT NULL COMMENT '反核销时间',
+  cancel_remark      VARCHAR(500) DEFAULT NULL COMMENT '反核销原因',
+  PRIMARY KEY (writeoff_id),
+  UNIQUE KEY uk_ar_balance_writeoff_no (writeoff_no),
+  KEY idx_abw_bill (ar_bill_id, status),
+  KEY idx_abw_customer (customer_id, status),
+  KEY idx_abw_account (account_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='应收账单余额核销表';
+
+-- 存量数据：为仅有账单、没有账户的客户补建账户（理论上CNY账户均已自动开户）
+INSERT INTO customer_account (customer_id, currency, balance, frozen_balance, total_credit, extra_credit, used_credit, tax, version, create_by, create_time, del_flag)
+SELECT b.customer_id, b.currency, 0, 0, 0, 0, 0, 0, 0, 'system', NOW(), '0'
+FROM (
+  SELECT customer_id, currency FROM ar_bill
+  WHERE status IN ('CONFIRMED','PARTIAL_WRITTEN_OFF')
+  GROUP BY customer_id, currency
+) b
+LEFT JOIN customer_account a
+  ON a.customer_id = b.customer_id
+ AND a.currency COLLATE utf8mb4_general_ci = b.currency
+ AND a.del_flag = '0'
+WHERE a.id IS NULL;
+
+-- 已用额度 = 该客户该币种 已确认/部分核销账单的未核销金额合计
+UPDATE customer_account a
+JOIN (
+  SELECT customer_id, currency, SUM(unwritten_amount) AS used_total
+  FROM ar_bill
+  WHERE status IN ('CONFIRMED','PARTIAL_WRITTEN_OFF')
+  GROUP BY customer_id, currency
+) t ON t.customer_id = a.customer_id
+   AND t.currency COLLATE utf8mb4_general_ci = a.currency
+SET a.used_credit = t.used_total,
+    a.version = a.version + 1,
+    a.update_by = 'system',
+    a.update_time = NOW()
+WHERE a.del_flag = '0';
+
+-- 菜单（父菜单 2309 = 客户/供应商管理；如环境ID不同请自行调整）
+INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+VALUES
+(2435, '客户账单', 2309, 3, 'customerbill', 'customersuppliermanagement/customerinfo/customerbill/index', '', 1, 0, 'C', '0', '0', 'customer:bill:list', 'documentation', 'admin', NOW(), '客户应收账单只读查询'),
+(2436, '账单详情', 2435, 1, '', NULL, '', 1, 0, 'F', '0', '0', 'customer:bill:query', '#', 'admin', NOW(), ''),
+(2437, '余额核销', 2435, 2, '', NULL, '', 1, 0, 'F', '0', '0', 'customer:bill:writeoff', '#', 'admin', NOW(), '用客户账户余额核销应收账单'),
+(2438, '取消余额核销', 2435, 3, '', NULL, '', 1, 0, 'F', '0', '0', 'customer:bill:writeoff:cancel', '#', 'admin', NOW(), '反核销');
+
+-- 普通角色授权（按实际角色调整）
+INSERT INTO sys_role_menu (role_id, menu_id) VALUES
+(2, 2435), (2, 2436), (2, 2437), (2, 2438);
@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS ar_bill (
 CREATE TABLE IF NOT EXISTS ar_bill_detail (
  detail_id           BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '账单订单明细ID',
  ar_bill_id          BIGINT(20) NOT NULL COMMENT '应收账单ID',
-  prc_bill_id         VARCHAR(36) NOT NULL COMMENT '来源订单计费ID，保持来源类型',
+  prc_order_bill_id   VARCHAR(36) NOT NULL COMMENT '来源计费订单ID，对应 prc_order_bill.bill_id',
  detail_no           INT(11) NOT NULL COMMENT '账单内顺序号',
  order_no            VARCHAR(64) NOT NULL COMMENT '订单号快照',
  tracking_no         VARCHAR(64) DEFAULT NULL COMMENT '运单号快照',
@@ -66,16 +66,16 @@ CREATE TABLE IF NOT EXISTS ar_bill_detail (
  create_by           VARCHAR(64) NOT NULL COMMENT '创建人',
  create_time         DATETIME NOT NULL COMMENT '创建时间',
  PRIMARY KEY (detail_id),
-  UNIQUE KEY uk_ar_bill_detail_source (ar_bill_id, prc_bill_id),
+  UNIQUE KEY uk_ar_bill_detail_source (ar_bill_id, prc_order_bill_id),
  UNIQUE KEY uk_ar_bill_detail_no (ar_bill_id, detail_no),
-  KEY idx_ar_bill_detail_source (prc_bill_id),
+  KEY idx_ar_bill_detail_source (prc_order_bill_id),
  CONSTRAINT fk_ar_bill_detail_bill FOREIGN KEY (ar_bill_id) REFERENCES ar_bill (ar_bill_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='应收账单订单快照';

 CREATE TABLE IF NOT EXISTS ar_bill_detail_fee (
  detail_fee_id      BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '账单费用明细ID',
  detail_id          BIGINT(20) NOT NULL COMMENT '账单订单明细ID',
-  prc_fee_id         VARCHAR(36) NOT NULL COMMENT '来源费用ID，保持来源类型',
+  prc_income_bill_fee_id VARCHAR(36) NOT NULL COMMENT '来源收入费用ID，对应 prc_income_bill_fee.fee_id',
  fee_no             INT(11) NOT NULL COMMENT '订单内费用顺序号',
  fee_type           VARCHAR(30) NOT NULL COMMENT '费用类型快照',
  fee_name           VARCHAR(100) DEFAULT NULL COMMENT '费用名称快照',
@@ -91,9 +91,9 @@ CREATE TABLE IF NOT EXISTS ar_bill_detail_fee (
  create_by          VARCHAR(64) NOT NULL COMMENT '创建人',
  create_time        DATETIME NOT NULL COMMENT '创建时间',
  PRIMARY KEY (detail_fee_id),
-  UNIQUE KEY uk_ar_detail_prc_fee (detail_id, prc_fee_id),
+  UNIQUE KEY uk_ar_detail_prc_income_fee (detail_id, prc_income_bill_fee_id),
  KEY idx_ar_detail_fee_type (fee_type),
-  KEY idx_ar_detail_prc_fee (prc_fee_id),
+  KEY idx_ar_detail_prc_income_fee (prc_income_bill_fee_id),
  KEY idx_ar_detail_fee_order (detail_id, fee_no, detail_fee_id),
  CONSTRAINT fk_ar_detail_fee_detail FOREIGN KEY (detail_id) REFERENCES ar_bill_detail (detail_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='应收账单费用快照';
@@ -1,5 +1,6 @@
 -- 应收账单：订单占用状态 + 单日期截止日迁移
 -- 适用于已经执行过 ar/ar_bill.sql、price/bill.sql 的数据库。
+-- 若数据库中的应收明细仍使用旧来源ID列名，请先执行 ar_bill_source_id_rename.sql。
 -- 请在业务低峰期执行；本脚本只做字段、索引和历史状态初始化，不删除账单明细。
 SET NAMES utf8mb4;
 SET @db_name := DATABASE();
@@ -60,11 +61,11 @@ DEALLOCATE PREPARE stmt;
 -- 3. 根据已有账单明细回填历史订单状态。作废账单不占用订单。
 UPDATE prc_order_bill o
 JOIN (
-    SELECT DISTINCT d.prc_bill_id
+    SELECT DISTINCT d.prc_order_bill_id
    FROM ar_bill_detail d
    JOIN ar_bill b ON b.ar_bill_id = d.ar_bill_id
    WHERE b.status <> 'VOID'
-) billed ON billed.prc_bill_id = o.bill_id
+) billed ON billed.prc_order_bill_id = o.bill_id
 SET o.ar_bill_status = 'BILLED'
 WHERE COALESCE(o.ar_bill_status, 'UNBILLED') <> 'BILLED';

@@ -0,0 +1,95 @@
+-- 应收账单来源ID字段命名迁移
+--
+-- 将历史字段名迁移为与当前来源表一致的名称：
+--   ar_bill_detail.prc_bill_id     -> prc_order_bill_id
+--   ar_bill_detail_fee.prc_fee_id  -> prc_income_bill_fee_id
+-- 脚本可重复执行，已完成迁移的字段和索引会自动跳过。
+SET NAMES utf8mb4;
+SET @db_name := DATABASE();
+
+-- 1. 应收账单订单明细：来源计费订单ID。
+SET @has_old_detail_column := (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail'
+      AND COLUMN_NAME = 'prc_bill_id'
+);
+SET @has_new_detail_column := (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail'
+      AND COLUMN_NAME = 'prc_order_bill_id'
+);
+SET @sql := IF(@has_old_detail_column > 0 AND @has_new_detail_column = 0,
+    'ALTER TABLE ar_bill_detail CHANGE COLUMN prc_bill_id prc_order_bill_id VARCHAR(36) NOT NULL COMMENT ''来源计费订单ID，对应 prc_order_bill.bill_id''',
+    'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 2. 应收账单费用明细：来源收入费用ID。
+SET @has_old_fee_column := (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND COLUMN_NAME = 'prc_fee_id'
+);
+SET @has_new_fee_column := (
+    SELECT COUNT(*)
+    FROM information_schema.COLUMNS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND COLUMN_NAME = 'prc_income_bill_fee_id'
+);
+SET @sql := IF(@has_old_fee_column > 0 AND @has_new_fee_column = 0,
+    'ALTER TABLE ar_bill_detail_fee CHANGE COLUMN prc_fee_id prc_income_bill_fee_id VARCHAR(36) NOT NULL COMMENT ''来源收入费用ID，对应 prc_income_bill_fee.fee_id''',
+    'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+-- 3. 费用明细索引同步改名，避免数据库中继续保留旧字段命名。
+SET @has_old_fee_unique := (
+    SELECT COUNT(*)
+    FROM information_schema.STATISTICS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND INDEX_NAME = 'uk_ar_detail_prc_fee'
+);
+SET @has_new_fee_unique := (
+    SELECT COUNT(*)
+    FROM information_schema.STATISTICS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND INDEX_NAME = 'uk_ar_detail_prc_income_fee'
+);
+SET @sql := IF(@has_old_fee_unique > 0 AND @has_new_fee_unique = 0,
+    'ALTER TABLE ar_bill_detail_fee RENAME INDEX uk_ar_detail_prc_fee TO uk_ar_detail_prc_income_fee',
+    'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+
+SET @has_old_fee_index := (
+    SELECT COUNT(*)
+    FROM information_schema.STATISTICS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND INDEX_NAME = 'idx_ar_detail_prc_fee'
+);
+SET @has_new_fee_index := (
+    SELECT COUNT(*)
+    FROM information_schema.STATISTICS
+    WHERE TABLE_SCHEMA = @db_name
+      AND TABLE_NAME = 'ar_bill_detail_fee'
+      AND INDEX_NAME = 'idx_ar_detail_prc_income_fee'
+);
+SET @sql := IF(@has_old_fee_index > 0 AND @has_new_fee_index = 0,
+    'ALTER TABLE ar_bill_detail_fee RENAME INDEX idx_ar_detail_prc_fee TO idx_ar_detail_prc_income_fee',
+    'SELECT 1');
+PREPARE stmt FROM @sql;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;