feat(order): 添加订单确认和审核功能并优化查询逻辑

- 在IOrderMainService中添加checkOrder和batchConfirmation方法
- 实现batchConfirmation批量确认订单功能，只允许已发货订单确认收货
- 添加PcCheckOrderBo用于订单审核业务对象
- 在PcOrderController中添加批量确认和订单审核接口
- 修复PcOrderReturnController中获取customerId的方式
- 将订单查询中的if条件改为choose when结构提升性能
- 新增CreditApply相关实体、业务对象、控制器、服务和映射器
- 新增CustomerExpenseType相关实体、业务对象、控制器、服务和映射器

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/CreditApplyController.java

@@ -0,0 +1,106 @@
+package org.dromara.customer.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.customer.domain.vo.CreditApplyVo;
+import org.dromara.customer.domain.bo.CreditApplyBo;
+import org.dromara.customer.service.ICreditApplyService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 信用额度申请
+ * 前端访问路由地址为:/customer/creditApply
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/creditApply")
+public class CreditApplyController extends BaseController {
+
+    private final ICreditApplyService creditApplyService;
+
+    /**
+     * 查询信用额度申请列表
+     */
+    //@SaCheckPermission("customer:creditApply:list")
+    @GetMapping("/list")
+    public TableDataInfo<CreditApplyVo> list(CreditApplyBo bo, PageQuery pageQuery) {
+        return creditApplyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出信用额度申请列表
+     */
+    //@SaCheckPermission("customer:creditApply:export")
+    @Log(title = "信用额度申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(CreditApplyBo bo, HttpServletResponse response) {
+        List<CreditApplyVo> list = creditApplyService.queryList(bo);
+        ExcelUtil.exportExcel(list, "信用额度申请", CreditApplyVo.class, response);
+    }
+
+    /**
+     * 获取信用额度申请详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("customer:creditApply:query")
+    @GetMapping("/{id}")
+    public R<CreditApplyVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(creditApplyService.queryById(id));
+    }
+
+    /**
+     * 新增信用额度申请
+     */
+    //@SaCheckPermission("customer:creditApply:add")
+    @Log(title = "信用额度申请", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CreditApplyBo bo) {
+        return toAjax(creditApplyService.insertByBo(bo));
+    }
+
+    /**
+     * 修改信用额度申请
+     */
+    //@SaCheckPermission("customer:creditApply:edit")
+    @Log(title = "信用额度申请", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CreditApplyBo bo) {
+        return toAjax(creditApplyService.updateByBo(bo));
+    }
+
+    /**
+     * 删除信用额度申请
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("customer:creditApply:remove")
+    @Log(title = "信用额度申请", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(creditApplyService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/CustomerExpenseTypeController.java

@@ -0,0 +1,106 @@
+package org.dromara.customer.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
+import org.dromara.customer.service.ICustomerExpenseTypeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 客户费用类型
+ * 前端访问路由地址为:/customer/expenseType
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/expenseType")
+public class CustomerExpenseTypeController extends BaseController {
+
+    private final ICustomerExpenseTypeService customerExpenseTypeService;
+
+    /**
+     * 查询客户费用类型列表
+     */
+    //@SaCheckPermission("customer:expenseType:list")
+    @GetMapping("/list")
+    public TableDataInfo<CustomerExpenseTypeVo> list(CustomerExpenseTypeBo bo, PageQuery pageQuery) {
+        return customerExpenseTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出客户费用类型列表
+     */
+    //@SaCheckPermission("customer:expenseType:export")
+    @Log(title = "客户费用类型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(CustomerExpenseTypeBo bo, HttpServletResponse response) {
+        List<CustomerExpenseTypeVo> list = customerExpenseTypeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "客户费用类型", CustomerExpenseTypeVo.class, response);
+    }
+
+    /**
+     * 获取客户费用类型详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("customer:expenseType:query")
+    @GetMapping("/{id}")
+    public R<CustomerExpenseTypeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(customerExpenseTypeService.queryById(id));
+    }
+
+    /**
+     * 新增客户费用类型
+     */
+    //@SaCheckPermission("customer:expenseType:add")
+    @Log(title = "客户费用类型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CustomerExpenseTypeBo bo) {
+        return toAjax(customerExpenseTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改客户费用类型
+     */
+    //@SaCheckPermission("customer:expenseType:edit")
+    @Log(title = "客户费用类型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CustomerExpenseTypeBo bo) {
+        return toAjax(customerExpenseTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除客户费用类型
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("customer:expenseType:remove")
+    @Log(title = "客户费用类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(customerExpenseTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/pc/PcCreditApplyController.java

@@ -0,0 +1,55 @@
+package org.dromara.customer.controller.pc;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.customer.domain.bo.CreditApplyBo;
+import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
+import org.dromara.customer.domain.vo.CreditApplyVo;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.customer.service.ICreditApplyService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pcCreditApply")
+public class PcCreditApplyController extends BaseController {
+
+    private final ICreditApplyService creditApplyService;
+
+
+    @GetMapping("/list")
+    public TableDataInfo<CreditApplyVo> list(CreditApplyBo bo, PageQuery pageQuery) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止越权访问
+        bo.setCustomerId(customerId);
+
+        return creditApplyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 新增费用类型
+     */
+    @Log(title = "PC端-额度申请", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CreditApplyBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止为其他企业添加地址
+        bo.setCustomerId(customerId);
+
+        return toAjax(creditApplyService.insertByBo(bo));
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/pc/PcCustomerExpenseTypeController.java

@@ -0,0 +1,108 @@
+package org.dromara.customer.controller.pc;
+
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
+import org.dromara.customer.domain.bo.CustomerShippingAddressBo;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.customer.domain.vo.CustomerShippingAddressVo;
+import org.dromara.customer.service.ICustomerExpenseTypeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pcCustomerExpenseType")
+public class PcCustomerExpenseTypeController extends BaseController {
+
+    private final ICustomerExpenseTypeService customerExpenseTypeService;
+
+    @GetMapping("/list")
+    public TableDataInfo<CustomerExpenseTypeVo> list(CustomerExpenseTypeBo bo, PageQuery pageQuery) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止越权访问
+        bo.setCustomerId(customerId);
+
+        return customerExpenseTypeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 新增费用类型
+     */
+    @Log(title = "PC端-费用类型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CustomerExpenseTypeBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止为其他企业添加地址
+        bo.setCustomerId(customerId);
+
+        return toAjax(customerExpenseTypeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改费用类型
+     */
+    @Log(title = "PC端-费用类型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CustomerExpenseTypeBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证是否属于当前用户的企业
+        CustomerExpenseTypeVo customerExpenseTypeVo = customerExpenseTypeService.queryById(bo.getId());
+        if (customerExpenseTypeVo == null) {
+            return R.fail("类型不存在");
+        }
+        if (!customerId.equals(customerExpenseTypeVo.getCustomerId())) {
+            return R.fail("无权修改该类型");
+        }
+
+        // 强制设置企业ID
+        bo.setCustomerId(customerId);
+
+        return toAjax(customerExpenseTypeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除收货地址
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "PC端-费用类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证所有地址是否都属于当前用户的企业
+        for (Long id : ids) {
+            CustomerExpenseTypeVo customerExpenseTypeVo = customerExpenseTypeService.queryById(id);
+            if (customerExpenseTypeVo == null) {
+                return R.fail("类型ID " + id + " 不存在");
+            }
+            if (!customerId.equals(customerExpenseTypeVo.getCustomerId())) {
+                return R.fail("无权删除类型ID " + id);
+            }
+        }
+
+        return toAjax(customerExpenseTypeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/CreditApply.java

@@ -0,0 +1,104 @@
+package org.dromara.customer.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+
+/**
+ * 信用额度申请对象 credit_apply
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("credit_apply")
+public class CreditApply extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    private String customerNo;
+
+    /**
+     * 申请单号
+     */
+    private String applyNo;
+
+    /**
+     * 月采购额
+     */
+    private BigDecimal monthPurchase;
+
+    /**
+     * 年采购额
+     */
+    private BigDecimal yearPurchase;
+
+    /**
+     * 申请额度（单位：元）
+     */
+    private BigDecimal applyAmount;
+
+    /**
+     * 额度有效期（如：6个月、12个月）
+     */
+    private Integer amountPeriod;
+
+    /**
+     * 主要采购产品
+     */
+    private String mainPurchase;
+
+    /**
+     * 其他采购产品
+     */
+    private String otherPurchase;
+
+    /**
+     * 合作证明图片路径
+     */
+    private String cooperationImage;
+
+    /**
+     * 审批状态（0-待审核, 1-通过, 2-拒绝）
+     */
+    private String approvalStatus;
+
+    /**
+     * 审批意见
+     */
+    private String approvalComment;
+
+    /**
+     * 原有额度
+     */
+    private BigDecimal oldAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/CustomerExpenseType.java

@@ -0,0 +1,67 @@
+package org.dromara.customer.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 客户费用类型对象 customer_expense_type
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("customer_expense_type")
+public class CustomerExpenseType extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 客户编号
+     */
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    private String customerNo;
+
+    /**
+     * 费用名称
+     */
+    private String expenseName;
+
+    /**
+     * 费用类型（业务自定义）
+     */
+    private String type;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/CreditApplyBo.java

@@ -0,0 +1,102 @@
+package org.dromara.customer.domain.bo;
+
+import org.dromara.customer.domain.CreditApply;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+/**
+ * 信用额度申请业务对象 credit_apply
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = CreditApply.class, reverseConvertGenerate = false)
+public class CreditApplyBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    private String customerNo;
+
+    /**
+     * 申请单号
+     */
+    private String applyNo;
+
+    /**
+     * 月采购额
+     */
+    private BigDecimal monthPurchase;
+
+    /**
+     * 年采购额
+     */
+    private BigDecimal yearPurchase;
+
+    /**
+     * 申请额度（单位：元）
+     */
+    private BigDecimal applyAmount;
+
+    /**
+     * 额度有效期（如：6个月、12个月）
+     */
+    private Integer amountPeriod;
+
+    /**
+     * 主要采购产品
+     */
+    private String mainPurchase;
+
+    /**
+     * 其他采购产品
+     */
+    private String otherPurchase;
+
+    /**
+     * 合作证明图片路径
+     */
+    private String cooperationImage;
+
+    /**
+     * 审批状态（0-待审核, 1-通过, 2-拒绝）
+     */
+    private String approvalStatus;
+
+    /**
+     * 审批意见
+     */
+    private String approvalComment;
+
+    /**
+     * 原有额度
+     */
+    private BigDecimal oldAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/CustomerExpenseTypeBo.java

@@ -0,0 +1,59 @@
+package org.dromara.customer.domain.bo;
+
+import org.dromara.customer.domain.CustomerExpenseType;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 客户费用类型业务对象 customer_expense_type
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = CustomerExpenseType.class, reverseConvertGenerate = false)
+public class CustomerExpenseTypeBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 客户编号
+     */
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    private String customerNo;
+
+    /**
+     * 费用名称
+     */
+    private String expenseName;
+
+    /**
+     * 费用类型（业务自定义）
+     */
+    private String type;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/CreditApplyVo.java

@@ -0,0 +1,133 @@
+package org.dromara.customer.domain.vo;
+
+import java.math.BigDecimal;
+
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.customer.domain.CreditApply;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 信用额度申请视图对象 credit_apply
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = CreditApply.class)
+public class CreditApplyVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 客户id
+     */
+    @ExcelProperty(value = "客户id")
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    @ExcelProperty(value = "客户编号")
+    private String customerNo;
+
+    /**
+     * 申请单号
+     */
+    @ExcelProperty(value = "申请单号")
+    private String applyNo;
+
+    /**
+     * 月采购额
+     */
+    @ExcelProperty(value = "月采购额")
+    private BigDecimal monthPurchase;
+
+    /**
+     * 年采购额
+     */
+    @ExcelProperty(value = "年采购额")
+    private BigDecimal yearPurchase;
+
+    /**
+     * 申请额度（单位：元）
+     */
+    @ExcelProperty(value = "申请额度", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "单=位：元")
+    private BigDecimal applyAmount;
+
+    /**
+     * 额度有效期（如：6个月、12个月）
+     */
+    @ExcelProperty(value = "额度有效期", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：6个月、12个月")
+    private Integer amountPeriod;
+
+    /**
+     * 主要采购产品
+     */
+    @ExcelProperty(value = "主要采购产品")
+    private String mainPurchase;
+
+    /**
+     * 其他采购产品
+     */
+    @ExcelProperty(value = "其他采购产品")
+    private String otherPurchase;
+
+    /**
+     * 合作证明图片路径
+     */
+    @ExcelProperty(value = "合作证明图片路径")
+    private String cooperationImage;
+
+    /**
+     * 合作证明图片路径Url
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "cooperationImage")
+    private String cooperationImageUrl;
+    /**
+     * 审批状态（0-待审核, 1-通过, 2-拒绝）
+     */
+    @ExcelProperty(value = "审批状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=-待审核,,1=-通过,,2=-拒绝")
+    private String approvalStatus;
+
+    /**
+     * 审批意见
+     */
+    @ExcelProperty(value = "审批意见")
+    private String approvalComment;
+
+    /**
+     * 原有额度
+     */
+    @ExcelProperty(value = "原有额度")
+    private BigDecimal oldAmount;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private Date createTime;
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/CustomerExpenseTypeVo.java

@@ -0,0 +1,76 @@
+package org.dromara.customer.domain.vo;
+
+import org.dromara.customer.domain.CustomerExpenseType;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 客户费用类型视图对象 customer_expense_type
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = CustomerExpenseType.class)
+public class CustomerExpenseTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 客户编号
+     */
+    @ExcelProperty(value = "客户编号")
+    private Long customerId;
+
+    /**
+     * 客户编号
+     */
+    @ExcelProperty(value = "客户编号")
+    private String customerNo;
+
+    /**
+     * 费用名称
+     */
+    @ExcelProperty(value = "费用名称")
+    private String expenseName;
+
+    /**
+     * 费用类型（业务自定义）
+     */
+    @ExcelProperty(value = "费用类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "业=务自定义")
+    private String type;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/mapper/CreditApplyMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.customer.mapper;
+
+import org.dromara.customer.domain.CreditApply;
+import org.dromara.customer.domain.vo.CreditApplyVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 信用额度申请Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+public interface CreditApplyMapper extends BaseMapperPlus<CreditApply, CreditApplyVo> {
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/mapper/CustomerExpenseTypeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.customer.mapper;
+
+import org.dromara.customer.domain.CustomerExpenseType;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 客户费用类型Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+public interface CustomerExpenseTypeMapper extends BaseMapperPlus<CustomerExpenseType, CustomerExpenseTypeVo> {
+
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/ICreditApplyService.java

@@ -0,0 +1,70 @@
+package org.dromara.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.customer.domain.CreditApply;
+import org.dromara.customer.domain.vo.CreditApplyVo;
+import org.dromara.customer.domain.bo.CreditApplyBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 信用额度申请Service接口
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+public interface ICreditApplyService extends IService<CreditApply>{
+
+    /**
+     * 查询信用额度申请
+     *
+     * @param id 主键
+     * @return 信用额度申请
+     */
+    CreditApplyVo queryById(Long id);
+
+    /**
+     * 分页查询信用额度申请列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 信用额度申请分页列表
+     */
+    TableDataInfo<CreditApplyVo> queryPageList(CreditApplyBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的信用额度申请列表
+     *
+     * @param bo 查询条件
+     * @return 信用额度申请列表
+     */
+    List<CreditApplyVo> queryList(CreditApplyBo bo);
+
+    /**
+     * 新增信用额度申请
+     *
+     * @param bo 信用额度申请
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(CreditApplyBo bo);
+
+    /**
+     * 修改信用额度申请
+     *
+     * @param bo 信用额度申请
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(CreditApplyBo bo);
+
+    /**
+     * 校验并批量删除信用额度申请信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/ICustomerExpenseTypeService.java

@@ -0,0 +1,70 @@
+package org.dromara.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.customer.domain.CustomerExpenseType;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 客户费用类型Service接口
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+public interface ICustomerExpenseTypeService extends IService<CustomerExpenseType>{
+
+    /**
+     * 查询客户费用类型
+     *
+     * @param id 主键
+     * @return 客户费用类型
+     */
+    CustomerExpenseTypeVo queryById(Long id);
+
+    /**
+     * 分页查询客户费用类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客户费用类型分页列表
+     */
+    TableDataInfo<CustomerExpenseTypeVo> queryPageList(CustomerExpenseTypeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的客户费用类型列表
+     *
+     * @param bo 查询条件
+     * @return 客户费用类型列表
+     */
+    List<CustomerExpenseTypeVo> queryList(CustomerExpenseTypeBo bo);
+
+    /**
+     * 新增客户费用类型
+     *
+     * @param bo 客户费用类型
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(CustomerExpenseTypeBo bo);
+
+    /**
+     * 修改客户费用类型
+     *
+     * @param bo 客户费用类型
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(CustomerExpenseTypeBo bo);
+
+    /**
+     * 校验并批量删除客户费用类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CreditApplyServiceImpl.java

@@ -0,0 +1,160 @@
+package org.dromara.customer.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.SequenceUtils;
+import org.dromara.customer.domain.CreditApply;
+import org.dromara.customer.domain.CustomerSalesInfo;
+import org.dromara.customer.domain.bo.CreditApplyBo;
+import org.dromara.customer.domain.vo.CreditApplyVo;
+import org.dromara.customer.domain.vo.CustomerSalesInfoVo;
+import org.dromara.customer.mapper.CreditApplyMapper;
+import org.dromara.customer.mapper.CustomerSalesInfoMapper;
+import org.dromara.customer.service.ICreditApplyService;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 信用额度申请Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class CreditApplyServiceImpl extends ServiceImpl<CreditApplyMapper, CreditApply> implements ICreditApplyService {
+
+    private static final String APPLY_NO_KEY = "credit_apply:apply_no";
+
+    private final CreditApplyMapper baseMapper;
+
+    private final CustomerSalesInfoMapper customerSalesInfoMapper;
+
+    /**
+     * 查询信用额度申请
+     *
+     * @param id 主键
+     * @return 信用额度申请
+     */
+    @Override
+    public CreditApplyVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询信用额度申请列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 信用额度申请分页列表
+     */
+    @Override
+    public TableDataInfo<CreditApplyVo> queryPageList(CreditApplyBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<CreditApply> lqw = buildQueryWrapper(bo);
+        Page<CreditApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的信用额度申请列表
+     *
+     * @param bo 查询条件
+     * @return 信用额度申请列表
+     */
+    @Override
+    public List<CreditApplyVo> queryList(CreditApplyBo bo) {
+        LambdaQueryWrapper<CreditApply> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<CreditApply> buildQueryWrapper(CreditApplyBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<CreditApply> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(CreditApply::getId);
+        lqw.eq(bo.getCustomerId() != null, CreditApply::getCustomerId, bo.getCustomerId());
+        lqw.eq(StringUtils.isNotBlank(bo.getCustomerNo()), CreditApply::getCustomerNo, bo.getCustomerNo());
+        lqw.eq(StringUtils.isNotBlank(bo.getApplyNo()), CreditApply::getApplyNo, bo.getApplyNo());
+        lqw.eq(bo.getMonthPurchase() != null, CreditApply::getMonthPurchase, bo.getMonthPurchase());
+        lqw.eq(bo.getYearPurchase() != null, CreditApply::getYearPurchase, bo.getYearPurchase());
+        lqw.eq(bo.getApplyAmount() != null, CreditApply::getApplyAmount, bo.getApplyAmount());
+        lqw.eq(bo.getAmountPeriod() != null, CreditApply::getAmountPeriod, bo.getAmountPeriod());
+        lqw.eq(StringUtils.isNotBlank(bo.getMainPurchase()), CreditApply::getMainPurchase, bo.getMainPurchase());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherPurchase()), CreditApply::getOtherPurchase, bo.getOtherPurchase());
+        lqw.eq(StringUtils.isNotBlank(bo.getCooperationImage()), CreditApply::getCooperationImage, bo.getCooperationImage());
+        lqw.eq(StringUtils.isNotBlank(bo.getApprovalStatus()), CreditApply::getApprovalStatus, bo.getApprovalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getApprovalComment()), CreditApply::getApprovalComment, bo.getApprovalComment());
+        lqw.eq(bo.getOldAmount() != null, CreditApply::getOldAmount, bo.getOldAmount());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), CreditApply::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增信用额度申请
+     *
+     * @param bo 信用额度申请
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(CreditApplyBo bo) {
+        bo.setApplyNo(SequenceUtils.nextPaddedIdStr(APPLY_NO_KEY, Duration.ofDays(3650), 6));
+        CustomerSalesInfoVo salesInfoVo = customerSalesInfoMapper.selectVoOne(new LambdaQueryWrapper<CustomerSalesInfo>().eq(CustomerSalesInfo::getCustomerId, bo.getCustomerId()).last("LIMIT 1"));
+        if (salesInfoVo != null) {
+            bo.setOldAmount(salesInfoVo.getCreditAmount());
+        }
+        CreditApply add = MapstructUtils.convert(bo, CreditApply.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改信用额度申请
+     *
+     * @param bo 信用额度申请
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(CreditApplyBo bo) {
+        CreditApply update = MapstructUtils.convert(bo, CreditApply.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(CreditApply entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除信用额度申请信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerExpenseTypeServiceImpl.java

@@ -0,0 +1,138 @@
+package org.dromara.customer.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.customer.domain.bo.CustomerExpenseTypeBo;
+import org.dromara.customer.domain.vo.CustomerExpenseTypeVo;
+import org.dromara.customer.domain.CustomerExpenseType;
+import org.dromara.customer.mapper.CustomerExpenseTypeMapper;
+import org.dromara.customer.service.ICustomerExpenseTypeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 客户费用类型Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-02-24
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class CustomerExpenseTypeServiceImpl  extends ServiceImpl<CustomerExpenseTypeMapper, CustomerExpenseType> implements ICustomerExpenseTypeService {
+
+    private final CustomerExpenseTypeMapper baseMapper;
+
+    /**
+     * 查询客户费用类型
+     *
+     * @param id 主键
+     * @return 客户费用类型
+     */
+    @Override
+    public CustomerExpenseTypeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询客户费用类型列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客户费用类型分页列表
+     */
+    @Override
+    public TableDataInfo<CustomerExpenseTypeVo> queryPageList(CustomerExpenseTypeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<CustomerExpenseType> lqw = buildQueryWrapper(bo);
+        Page<CustomerExpenseTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的客户费用类型列表
+     *
+     * @param bo 查询条件
+     * @return 客户费用类型列表
+     */
+    @Override
+    public List<CustomerExpenseTypeVo> queryList(CustomerExpenseTypeBo bo) {
+        LambdaQueryWrapper<CustomerExpenseType> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<CustomerExpenseType> buildQueryWrapper(CustomerExpenseTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<CustomerExpenseType> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(CustomerExpenseType::getId);
+        lqw.eq(bo.getCustomerId() != null, CustomerExpenseType::getCustomerId, bo.getCustomerId());
+        lqw.eq(StringUtils.isNotBlank(bo.getCustomerNo()), CustomerExpenseType::getCustomerNo, bo.getCustomerNo());
+        lqw.like(StringUtils.isNotBlank(bo.getExpenseName()), CustomerExpenseType::getExpenseName, bo.getExpenseName());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), CustomerExpenseType::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), CustomerExpenseType::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), CustomerExpenseType::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增客户费用类型
+     *
+     * @param bo 客户费用类型
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(CustomerExpenseTypeBo bo) {
+        CustomerExpenseType add = MapstructUtils.convert(bo, CustomerExpenseType.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改客户费用类型
+     *
+     * @param bo 客户费用类型
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(CustomerExpenseTypeBo bo) {
+        CustomerExpenseType update = MapstructUtils.convert(bo, CustomerExpenseType.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(CustomerExpenseType entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除客户费用类型信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/resources/mapper/customer/CustomerExpenseTypeMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.customer.mapper.CustomerExpenseTypeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/pc/PcOrderController.java

@@ -15,6 +15,7 @@ import org.dromara.customer.api.RemoteCustomerService;
 import org.dromara.customer.api.domain.CustomerApiVo;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.bo.OrderProductBo;
+import org.dromara.order.domain.bo.PcCheckOrderBo;
 import org.dromara.order.domain.bo.PcSubmitOrderBo;
 import org.dromara.order.domain.dto.OrderPayDto;
 import org.dromara.order.domain.vo.OrderMainVo;
@@ -339,4 +340,51 @@ public class PcOrderController extends BaseController {
 
         return R.ok(orderPayResult);
     }
+
+    @GetMapping("/batchConfirmation")
+    public R<Void> batchConfirmation(@RequestParam("orderIds") List<Long> orderIds) {
+        if (orderIds == null || orderIds.isEmpty()) {
+            throw new IllegalArgumentException("订单ID列表不能为空");
+        }
+        if (orderIds.size() > 1000) {
+            throw new IllegalArgumentException("订单ID数量不能超过1000个");
+        }
+
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证所有订单是否都属于当前用户的企业
+        for (Long orderId : orderIds) {
+            OrderMainVo order = orderMainService.queryById(orderId);
+            if (order == null) {
+                throw new IllegalArgumentException("订单ID " + orderId + " 不存在");
+            }
+            if (!customerId.equals(order.getCustomerId())) {
+                throw new IllegalArgumentException("无权访问订单ID " + orderId);
+            }
+        }
+
+        Set<Long> uniqueOrderIds = new HashSet<>(orderIds);
+        return toAjax(orderMainService.batchConfirmation(uniqueOrderIds));
+    }
+
+    /**
+     * 订单审核（PC端审核）
+     */
+    @Log(title = "PC端-订单审核", businessType = BusinessType.UPDATE)
+    @PostMapping("/checkOrder")
+    public R<?> checkOrder(@RequestBody @Validated PcCheckOrderBo checkOrderBo) {
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        Long userId = LoginHelper.getLoginUser().getUserId();
+
+        // 调用 Service，返回结果
+        Boolean checkOrderResult = orderMainService.checkOrder(
+            customerId,
+            userId,
+            checkOrderBo
+        );
+
+        return R.ok(checkOrderResult);
+    }
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/pc/PcOrderReturnController.java

@@ -44,7 +44,7 @@ public class PcOrderReturnController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<OrderReturnVo> list(OrderReturnBo bo, PageQuery pageQuery) {
         // 获取当前登录用户的企业ID
-        Long customerId = LoginHelper.getUserId();
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
         // 强制设置企业ID，防止越权访问
         bo.setCustomerId(customerId);
 
@@ -65,7 +65,7 @@ public class PcOrderReturnController extends BaseController {
 
         // 验证售后记录是否属于当前用户的企业
         if (vo != null) {
-            Long customerId = LoginHelper.getUserId();
+            Long customerId = LoginHelper.getLoginUser().getCustomerId();
             if (!customerId.equals(vo.getCustomerId())) {
                 return R.fail("无权访问该售后记录");
             }
@@ -83,7 +83,7 @@ public class PcOrderReturnController extends BaseController {
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderReturnBo bo) {
         // 获取当前登录用户的企业ID
-        Long customerId = LoginHelper.getUserId();
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
         // 强制设置企业ID，防止为其他企业创建售后申请
         bo.setCustomerId(customerId);
 
@@ -99,7 +99,7 @@ public class PcOrderReturnController extends BaseController {
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderReturnBo bo) {
         // 获取当前登录用户的企业ID
-        Long customerId = LoginHelper.getUserId();
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
 
         // 验证售后记录是否属于当前用户的企业
         OrderReturnVo existingReturn = orderReturnService.queryById(bo.getId());
@@ -127,7 +127,7 @@ public class PcOrderReturnController extends BaseController {
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable("ids") Long[] ids) {
         // 获取当前登录用户的企业ID
-        Long customerId = LoginHelper.getUserId();
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
 
         // 验证所有售后记录是否都属于当前用户的企业
         for (Long id : ids) {

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/PcCheckOrderBo.java

@@ -0,0 +1,23 @@
+package org.dromara.order.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class PcCheckOrderBo {
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 审核状态
+     */
+    private String checkStatus;
+
+    /**
+     * 审核备注
+     */
+    private String checkRemark;
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderMainService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.dromara.order.domain.OrderMain;
 import org.dromara.order.domain.OrderProduct;
 import org.dromara.order.domain.bo.OrderProductBo;
+import org.dromara.order.domain.bo.PcCheckOrderBo;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -81,6 +82,8 @@ public interface IOrderMainService extends IService<OrderMain> {
 
     Boolean orderPay(Long customerId, Long orderId, String payType);
 
+    Boolean checkOrder(Long customerId, Long userId, PcCheckOrderBo bo);
+
     /**
      * 修改订单审核状态
      *
@@ -98,5 +101,7 @@ public interface IOrderMainService extends IService<OrderMain> {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    Boolean batchConfirmation(Set<Long> ids);
+
     Boolean closeOrderByIds(Collection<Long> ids, Boolean isValid);
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -24,6 +24,7 @@ import org.dromara.order.domain.OrderMain;
 import org.dromara.order.domain.OrderProduct;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.bo.OrderProductBo;
+import org.dromara.order.domain.bo.PcCheckOrderBo;
 import org.dromara.order.domain.dto.AssignmentStatsDto;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.domain.vo.OrderProductVo;
@@ -617,4 +618,28 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         int affectedRows = baseMapper.update(null, wrapper);
         return affectedRows > 0;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchConfirmation(Set<Long> ids) {
+        // 2. 参数校验
+        if (CollectionUtils.isEmpty(ids)) {
+            return true;
+        }
+
+        LambdaUpdateWrapper<OrderMain> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.in(OrderMain::getId, ids)
+            .eq(OrderMain::getOrderStatus, OrderStatus.SHIPPED.getCode()) // 只有已发货的订单才能确认收货
+            .set(OrderMain::getOrderStatus, OrderStatus.COMPLETED.getCode());
+
+        // 执行更新
+        boolean updateSuccess = this.update(updateWrapper);
+
+        return updateSuccess;
+    }
+
+    @Override
+    public Boolean checkOrder(Long customerId, Long userId, PcCheckOrderBo bo) {
+        return null;
+    }
 }

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMainMapper.xml

@@ -37,15 +37,17 @@
         o.customer_id = #{customerId}
         AND o.order_status = '5'
         AND o.del_flag = '0'
-        <if test="evaluationStatus != null and evaluationStatus == '0'">
-            AND oe.max_type IS NULL
-        </if>
-        <if test="evaluationStatus != null and evaluationStatus == '1'">
-            AND oe.max_type = 1
-        </if>
-        <if test="evaluationStatus != null and evaluationStatus == '2'">
-            AND oe.max_type = 2
-        </if>
+        <choose>
+            <when test="evaluationStatus != null and evaluationStatus == '0'">
+                AND oe.max_type IS NULL
+            </when>
+            <when test="evaluationStatus != null and evaluationStatus == '1'">
+                AND oe.max_type = 1
+            </when>
+            <when test="evaluationStatus != null and evaluationStatus == '2'">
+                AND oe.max_type = 2
+            </when>
+        </choose>
         ORDER BY o.order_time DESC
     </select>
 </mapper>