feat: ERP升级

1、财务分支

feat: ERP升级
1、财务分支
谢茂盛
1 parent 8e2b3476
Showing 15 changed files with 829 additions and 21 deletions
sql/dml_erp_bill_v2.sql
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/domain/ApplyStatusEnum.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillOrderDO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisExportVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisResultVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCommitApplyVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceHoldTimeItemVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceOrderBaseItemVO.java
src/main/java/com/order/erp/service/order/InvoiceBillOrderService.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
@@ -2,10 +2,11 @@ DROP TABLE IF EXISTS `invoice_bill_order`;
 CREATE TABLE `invoice_bill_order` (
           `id` bigint NOT NULL AUTO_INCREMENT,
           `invoice_no` varchar(64)  NOT NULL COMMENT '发票单号',
-          `bg_url` varchar(256)  NOT NULL COMMENT '报关单url地址',
-          `back_refund_date` varchar(64) NOT null COMMENT '必须回款日期',
+          `bg_url` varchar(512)  default NULL COMMENT '报关单url地址',
+          `back_refund_date` varchar(64) default null COMMENT '必须回款日期',
+          `actual_refund_date` varchar(64) default null COMMENT '实际回款日期',
           `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '发生扣款金额',
-          `deduct_url` varchar(256)  NOT NULL COMMENT '扣款单url地址',
+          `deduct_url` varchar(512)  default NULL COMMENT '扣款单url地址',
           `actual_receivable_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应收金额',
           `actual_payed_amount1` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额1',
           `actual_payed_amount2` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额2',
@@ -41,10 +42,10 @@ DROP TABLE IF EXISTS `produce_payment_check_bill_order`;
 CREATE TABLE `produce_payment_check_bill_order` (
           `id` bigint NOT NULL AUTO_INCREMENT,
           `check_no` varchar(64)  NOT NULL COMMENT '生产科对账单',
-          `invoice_url` varchar(256)  NOT NULL COMMENT '发票url地址',
-          `deduct_pdf_url` varchar(256)  NOT NULL COMMENT '扣款单url地址',
-          `payed_date` varchar(64) NOT null COMMENT '生产科应付款日期',
-          `deduct_dept` varchar(64) NOT null COMMENT '生产科扣款责任部门',
+          `invoice_url` varchar(512)  default NULL COMMENT '发票url地址',
+          `deduct_pdf_url` varchar(512)  default NULL COMMENT '扣款单url地址',
+          `payed_date` varchar(64) default null COMMENT '生产科应付款日期',
+          `deduct_dept` varchar(64) default null COMMENT '生产科扣款责任部门',
           `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '生产科扣款金额',
           `actual_payed_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额',
           `status`    INT          NOT NULL COMMENT '总经理审核状态 0：待审核、1：审核通过，2：审核驳回',
 package com.order.erp.controller;
+import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.jsr303.OperateGroup;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.service.order.InvoiceBillOrderService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 /**
  * 应收款账单表(InvoiceBillOrder)表控制层
@@ -45,10 +50,33 @@ public class InvoiceBillOrderController {
      * @return 查询结果
      */
     @PostMapping("/list_base_order_info_by")
-    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBaseOrderQueryVO queryVO) {
+    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated InvoiceBaseOrderQueryVO queryVO) {
         return invoiceBillOrderService.listBaseOrderInfoBy(queryVO);
     }
+    /**
+     * 分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_analysis_by")
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillAnalysisVO queryVO) {
+        return invoiceBillOrderService.listAnalysisBy(queryVO);
+    }
+
+    /**
+     * 导出分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping(value = "/export")
+    @ApiOperation("导出分析列表")
+    @AnonymousAccess
+    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceBillAnalysisVO queryVO) throws IOException, Excel4JException {
+        invoiceBillOrderService.export(response, queryVO);
+    }
     /**
      * 创建invoice单据
@@ -62,6 +90,17 @@ public class InvoiceBillOrderController {
     }
     /**
+     * 获取必须回款日期
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/get_back_refund_date")
+    public ServerResult getBackRefundDate(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.getBackRefundDate(createVO);
+    }
+
+    /**
      * 更新扣款信息
      *
      * @param deductInfoVO 数据VO
@@ -84,6 +123,17 @@ public class InvoiceBillOrderController {
     }
     /**
+     * 提交审核
+     *
+     * @param commitApplyVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/commit_apply")
+    public ServerResult commitApply(@RequestBody InvoiceBillCommitApplyVO commitApplyVO) {
+        return invoiceBillOrderService.commitApply(commitApplyVO);
+    }
+
+    /**
      * 删除数据
      *
      * @param invoiceBillOrderQueryVO 查询条件
@@ -13,6 +13,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ApplyStatusEnum {
+    NO_COMMIT(-1, "未提交审核"),
+
     WAIT_AUDIT(0, "待审批"),
     AUDIT_PASS(10, "已通过"),
@@ -18,6 +18,10 @@ public enum ApplyTypeEnum {
     ORDER_PROFIT_APPLY(10, "利润分析申请"),
     ORDER_REPORT_APPLY(20, "项目报告书申请"),
+
+    INVOICE_BILL_APPLY(30, "应收账单申请"),
+
+    CHECK_BILL_APPLY(40, "应付账单申请"),
     ;
     private Integer type;
@@ -37,6 +37,11 @@ public class InvoiceBillOrderDO extends BaseDO implements Serializable {
      */
     private String backRefundDate;
     /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+
+    /**
      * 发生扣款金额
      */
     private BigDecimal deductAmount;
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisExportVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 实际应收 - 实际应付
+     * 其他费用金额汇总
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 实际应收 - 实际应付 - 其他费用金额汇总
+     * 其他费用金额合计
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisResultVO implements Serializable {
+
+
+    /**
+     * 导出列表
+     */
+    private List<InvoiceBillAnalysisExportVO> exportVOS;
+
+    /**
+     * 合计数据
+     */
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 实际应收 - 实际应付
+     * 其他费用金额汇总
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 实际应收 - 实际应付 - 其他费用金额汇总
+     * 其他费用金额合计
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 合计数据
+     */
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisVO extends InvoiceBillOrderQueryVO implements Serializable {
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 提交审核
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCommitApplyVO implements Serializable {
+
+    private Long id;
+
+}
@@ -29,7 +29,7 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
     private String invoiceNo;
     /**
-     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回
      */
     private Integer status;
@@ -57,5 +57,15 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
      * 客户po号
      */
     private String customerPo;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- holdTime
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceHoldTimeItemVO implements Serializable {
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 订单hold时间
+     */
+    private String holdTime;
+
+    /**
+     * 基础订单信息
+     */
+    private OrderBaseInfoDO baseInfoDO;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceOrderBaseItemVO implements Serializable {
+
+    private Long orderId;
+
+    /**
+     * invoice编码
+     */
+    private String invoiceCode;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+
+}
@@ -5,6 +5,9 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
 import com.order.erp.domain.vo.order.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
  * 应收款账单表(InvoiceBillOrder)表服务接口
  *
@@ -28,6 +31,18 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
     ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO);
     /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException;
+
+    /**
      * 新增数据
      *
      * @param createVO 数据VO
@@ -36,6 +51,13 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
     ServerResult create(InvoiceBillCreateVO createVO);
     /**
+     *
+     * @param createVO
+     * @return
+     */
+    ServerResult getBackRefundDate(InvoiceBillCreateVO createVO);
+
+    /**
      * 更新扣款信息
      *
      * @param deductInfoVO 数据VO
@@ -52,6 +74,14 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
     ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO);
     /**
+     * 提交审核
+     *
+     * @param commitApplyVO
+     * @return
+     */
+    ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO);
+
+    /**
      * 通过主键删除数据
      *
      * @param invoiceBillOrderQueryVO 筛选条件
 package com.order.erp.service.order.impl;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
 import com.order.erp.common.utils.StringUtils;
 import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ApplyTypeEnum;
 import com.order.erp.domain.dto.BaseDO;
-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
-import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
-import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.InvoiceBillOrderMapper;
-import com.order.erp.service.order.InvoiceBillMappingService;
-import com.order.erp.service.order.InvoiceBillOrderService;
-import com.order.erp.service.order.OrderBaseInfoService;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.order.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 /**
@@ -42,9 +55,21 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     private OrderBaseInfoService orderBaseInfoService;
     @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+
+    @Resource
     private InvoiceBillMappingService invoiceBillMappingService;
     @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+
+    @Resource
+    private SystemSettingService systemSettingService;
+
+    @Resource
+    private DataScope dataScope;
+
+    @Resource
     private TransactionHelper transactionHelper;
@@ -56,17 +81,26 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     @Override
     public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
-        Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
+        return ServerResult.success(iPage);
+    }
-        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
+        Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+        return new LambdaQueryWrapper<InvoiceBillOrderDO>()
                 .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
                 .in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds)
                 .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
                 .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
                 .orderByDesc(InvoiceBillOrderDO::getId);
-        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
-        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
-        return ServerResult.success(iPage);
     }
     @Override
@@ -81,6 +115,250 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         return ServerResult.success(orderBaseInfoService.listByIds(orderIds));
     }
+    @Override
+    public ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO) {
+        return ServerResult.success(getAnalysisResult(queryVO));
+    }
+
+    @Override
+    public ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException {
+        InvoiceBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
+        if (Objects.isNull(resultVO)) {
+            throw new BusinessException("数据为空，不能导出！");
+        }
+        List<Map<String, Object>> list = buildExportMapVOS(resultVO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+
+            ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                    .opsSheet(list)
+                    .opsHeader().simple().texts(keys).done()
+                    .opsColumn().fields(keys).done()
+                    .height(CellPosition.CELL, 750)
+                    .done()
+                    .export(response.getOutputStream());
+        }
+        return ServerResult.success();
+    }
+
+    /**
+     * @param resultVO
+     * @return
+     */
+    private List<Map<String, Object>> buildExportMapVOS(InvoiceBillAnalysisResultVO resultVO) throws IOException {
+        List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 0;
+        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("编号", i++);
+            map.put("客户编码", exportVO.getCustomerCode());
+            map.put("INVOICE编码", exportVO.getInvoiceNo());
+            map.put("客户总金额汇总", exportVO.getCustomerTotalPrice());
+            map.put("客户扣款金额汇总", exportVO.getDeductAmount());
+            map.put("实际应收金额", exportVO.getActualReceivableAmount());
+            map.put("实际收款金额汇总", exportVO.getActualPayedAmount());
+            map.put("其他费用金额汇总", exportVO.getOtherAmount());
+            map.put("其他费用合计", exportVO.getOtherTotalAmount());
+            map.put("必须回款日期", exportVO.getBackRefundDate());
+            map.put("实际回款日期", exportVO.getActualRefundDate());
+            list.add(map);
+        }
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("编号", "合计");
+        map.put("客户编码", "");
+        map.put("INVOICE编码", "");
+        map.put("客户总金额汇总", resultVO.getCustomerTotalPrice());
+        map.put("客户扣款金额汇总", resultVO.getDeductAmount());
+        map.put("实际应收金额", resultVO.getActualReceivableAmount());
+        map.put("实际收款金额汇总", resultVO.getActualPayedAmount());
+        map.put("其他费用金额汇总", resultVO.getOtherAmount());
+        map.put("其他费用合计", resultVO.getOtherTotalAmount());
+        map.put("必须回款日期", "");
+        map.put("实际回款日期", "");
+        list.add(map);
+        return list;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private InvoiceBillAnalysisResultVO getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(queryWrapper);
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
+            return null;
+        }
+        Set<Long> ids = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getId).collect(Collectors.toSet());
+        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+            return null;
+        }
+        Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
+        Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
+        Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getInvoiceCode));
+        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillOrderDOMap, baseItemMap);
+        return wrapperAnalysisResultVO(exportVOS);
+    }
+
+    /**
+     * @param exportVOS
+     * @return
+     */
+    private InvoiceBillAnalysisResultVO wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
+        if (CollectionUtils.isEmpty(exportVOS)) {
+            return null;
+        }
+        InvoiceBillAnalysisResultVO resultVO = InvoiceBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
+        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal actualReceivableAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal otherAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal otherTotalAmount = new BigDecimal(Constant.ZERO);
+        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+            if (Objects.nonNull(exportVO.getCustomerTotalPrice())) {
+                customerTotalPrice = customerTotalPrice.add(exportVO.getCustomerTotalPrice());
+            }
+            if (Objects.nonNull(exportVO.getDeductAmount())) {
+                deductAmount = deductAmount.add(exportVO.getDeductAmount());
+            }
+            if (Objects.nonNull(exportVO.getActualReceivableAmount())) {
+                actualReceivableAmount = actualReceivableAmount.add(exportVO.getActualReceivableAmount());
+            }
+            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+            }
+            if (Objects.nonNull(exportVO.getOtherAmount())) {
+                otherAmount = customerTotalPrice.add(exportVO.getOtherAmount());
+            }
+            if (Objects.nonNull(exportVO.getOtherTotalAmount())) {
+                otherTotalAmount = otherTotalAmount.add(exportVO.getOtherTotalAmount());
+            }
+        }
+        resultVO.setCustomerTotalPrice(customerTotalPrice);
+        resultVO.setDeductAmount(deductAmount);
+        resultVO.setActualReceivableAmount(actualReceivableAmount);
+        resultVO.setActualPayedAmount(actualPayedAmount);
+        resultVO.setOtherAmount(otherAmount);
+        resultVO.setOtherTotalAmount(otherTotalAmount);
+        return resultVO;
+    }
+
+    /**
+     * @param invoiceBillOrderDOMap
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> wrapperAnalysisExport(Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOMap)) {
+            return Collections.emptyList();
+        }
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        for (Map.Entry<String, InvoiceBillOrderDO> entry : invoiceBillOrderDOMap.entrySet()) {
+            InvoiceBillOrderDO invoiceBillOrderDO = entry.getValue();
+            List<InvoiceBillAnalysisExportVO> exportVOS = transfer2analysisExportVO(invoiceBillOrderDO, baseItemMap);
+            if (CollectionUtils.isNotEmpty(exportVOS)) {
+                results.addAll(exportVOS);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> transfer2analysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        String invoiceNo = invoiceBillOrderDO.getInvoiceNo();
+        if (baseItemMap.containsKey(invoiceNo)) {
+            List<InvoiceOrderBaseItemVO> baseItemVOS = baseItemMap.get(invoiceNo);
+            Map<String, List<InvoiceOrderBaseItemVO>> listMap = baseItemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getCustomerCode));
+            for (Map.Entry<String, List<InvoiceOrderBaseItemVO>> entry : listMap.entrySet()) {
+                String customerCode = entry.getKey();
+                List<InvoiceOrderBaseItemVO> itemVOS = entry.getValue();
+                InvoiceBillAnalysisExportVO exportVO = buildAnalysisExportVO(invoiceBillOrderDO);
+                exportVO.setCustomerCode(customerCode);
+                if (CollectionUtils.isEmpty(itemVOS)) {
+                    exportVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO));
+                } else {
+                    BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+                    for (InvoiceOrderBaseItemVO itemVO : itemVOS) {
+                        customerTotalPrice = customerTotalPrice.add(Objects.nonNull(itemVO.getCustomerTotalPrice()) ? itemVO.getCustomerTotalPrice() : new BigDecimal(Constant.ZERO));
+                    }
+                    exportVO.setCustomerTotalPrice(customerTotalPrice);
+                }
+                results.add(exportVO);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private InvoiceBillAnalysisExportVO buildAnalysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO) {
+        InvoiceBillAnalysisExportVO exportVO = new InvoiceBillAnalysisExportVO();
+        BeanUtils.copyProperties(invoiceBillOrderDO, exportVO);
+        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount1())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount1());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount2())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount2());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount3())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount3());
+        }
+        exportVO.setActualPayedAmount(actualPayedAmount);
+        BigDecimal otherAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+                .subtract(exportVO.getActualPayedAmount());
+        exportVO.setOtherAmount(otherAmount);
+        BigDecimal otherTotalAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+                .subtract(exportVO.getActualPayedAmount()).subtract(otherAmount);
+        exportVO.setOtherTotalAmount(otherTotalAmount);
+        return exportVO;
+    }
+
+    /**
+     * @param mappingDOMap
+     * @return
+     */
+    private List<InvoiceOrderBaseItemVO> getInvoiceOrderBaseItems(Map<Long, InvoiceBillMappingDO> mappingDOMap) {
+        Set<Long> orderIds = mappingDOMap.keySet();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> baseItemVOS = new ArrayList<>();
+        for (Map.Entry<Long, OrderBaseInfoDO> entry : orderBaseInfoDOMap.entrySet()) {
+            Long orderId = entry.getKey();
+            OrderBaseInfoDO baseInfoDO = entry.getValue();
+            InvoiceOrderBaseItemVO itemVO = InvoiceOrderBaseItemVO.builder()
+                    .orderId(orderId)
+                    .customerCode(baseInfoDO.getCustomerCode())
+                    .build();
+            if (profitAnalysisDOMap.containsKey(orderId)) {
+                OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(orderId);
+                itemVO.setCustomerTotalPrice(Objects.isNull(profitAnalysisDO.getCustomerTotalPrice()) ? new BigDecimal(Constant.ZERO) : new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()));
+            } else {
+                itemVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO));
+            }
+
+            if (mappingDOMap.containsKey(orderId)) {
+                InvoiceBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                itemVO.setInvoiceCode(mappingDO.getInvoiceNo());
+            }
+            baseItemVOS.add(itemVO);
+        }
+        return baseItemVOS;
+    }
+
     /**
      * @param queryVO
      * @return
@@ -165,6 +443,74 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         return ServerResult.success();
     }
+    @Override
+    public ServerResult getBackRefundDate(InvoiceBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        InvoiceHoldTimeItemVO invoiceHoldTimeItemVO = getCustomerHoldTime(orderBaseInfoDOList);
+
+        return ServerResult.success(calculateBackRefundDate(invoiceHoldTimeItemVO));
+    }
+
+    /**
+     * @param invoiceHoldTimeItemVO
+     * @return
+     */
+    private String calculateBackRefundDate(InvoiceHoldTimeItemVO invoiceHoldTimeItemVO) {
+        Integer holdDays = getHoldTimeByCustomerCode(invoiceHoldTimeItemVO.getCustomerCode());
+        LocalDateTime holdTime = DateUtils.parse(invoiceHoldTimeItemVO.getHoldTime(), DateUtils.DATE_TIME).plusDays(holdDays);
+        return DateUtils.format(holdTime, DateUtils.DATE);
+    }
+
+    /**
+     * @param customerCode
+     * @return
+     */
+    private Integer getHoldTimeByCustomerCode(String customerCode) {
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
+                .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
+        String holdTime = systemSettingDO.getRelationValue();
+        return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
+    }
+
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    private InvoiceHoldTimeItemVO getCustomerHoldTime(List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return null;
+        }
+
+        Map<String, OrderBaseInfoDO> holdTimeMap = new HashMap<String, OrderBaseInfoDO>();
+        String maxHoldTime = null;
+        for (OrderBaseInfoDO baseInfoDO : orderBaseInfoDOList) {
+            if (StringUtils.isNotBlank(baseInfoDO.getOrderHodTime())) {
+                holdTimeMap.put(baseInfoDO.getOrderHodTime(), baseInfoDO);
+                if (StringUtils.isBlank(maxHoldTime)) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                } else if (maxHoldTime.compareTo(baseInfoDO.getOrderHodTime()) <= 0) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                }
+            }
+        }
+        if (StringUtils.isBlank(maxHoldTime)) {
+            return null;
+        }
+        InvoiceHoldTimeItemVO itemVO = new InvoiceHoldTimeItemVO();
+        if (holdTimeMap.containsKey(maxHoldTime)) {
+            OrderBaseInfoDO baseInfoDO = holdTimeMap.get(maxHoldTime);
+            itemVO.setCustomerCode(baseInfoDO.getCustomerCode());
+            itemVO.setHoldTime(maxHoldTime);
+            itemVO.setBaseInfoDO(baseInfoDO);
+        }
+        return itemVO;
+    }
+
     /**
      * @param createVO
      * @return
@@ -174,6 +520,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                 .invoiceNo(createVO.getInvoiceNo())
                 .bgUrl(createVO.getBgUrl())
                 .backRefundDate(createVO.getBackRefundDate())
+                .status(ApplyStatusEnum.NO_COMMIT.getStatus())
                 .build();
     }
@@ -218,6 +565,10 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             throw new BusinessException("存在相同的invoice订单！");
         }
+        List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag,Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId,createVO.getOrderIds()));
+        if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
+            throw new BusinessException("该勾选的订单已经绑定其他账单了！");
+        }
     }
     /**
@@ -235,6 +586,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (Objects.isNull(invoiceBillOrderDo)) {
             throw new BusinessException("应收款单据不存在");
         }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
         invoiceBillOrderDo.setDeductUrl(deductInfoVO.getDeductUrl());
         invoiceBillOrderDo.setDeductAmount(deductInfoVO.getDeductAmount());
         updateById(invoiceBillOrderDo);
@@ -250,6 +604,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (Objects.isNull(invoiceBillOrderDo)) {
             throw new BusinessException("应收款单据不存在");
         }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
         invoiceBillOrderDo.setBgUrl(amountInfoVO.getBgUrl());
         invoiceBillOrderDo.setActualReceivableAmount(amountInfoVO.getActualReceivableAmount());
         invoiceBillOrderDo.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1());
@@ -261,6 +618,73 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     }
     /**
+     * @param id
+     */
+    private void checkCommitApply(Long id) {
+        OrderFieldLockApplyDO applyDO = orderFieldLockApplyService.getOne(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(OrderFieldLockApplyDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .eq(OrderFieldLockApplyDO::getOrderId, id).last("limit 1"));
+        if (Objects.nonNull(applyDO)) {
+            throw new BusinessException("该账单还在审批中，请联系总经理审批后操作！");
+        }
+    }
+
+    @Override
+    public ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO) {
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(commitApplyVO.getId());
+        if (Objects.isNull(invoiceBillOrderDO)) {
+            throw new BusinessException("账单不存在！");
+        }
+        Long userId = dataScope.getLoginUserId();
+        checkApply(commitApplyVO, userId);
+
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceBillOrderDO, userId);
+        transactionHelper.run(() -> {
+            orderFieldLockApplyService.save(applyDO);
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
+            invoiceBillOrderDO.setActualRefundDate(DateUtils.format(LocalDateTime.now(), DateUtils.DATE));
+            updateById(invoiceBillOrderDO);
+        });
+        return ServerResult.success();
+    }
+
+    /**
+     * @param commitApplyVO
+     * @param userId
+     */
+    private void checkApply(InvoiceBillCommitApplyVO commitApplyVO, Long userId) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getOrderId, commitApplyVO.getId())
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param userId
+     * @return
+     */
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
+        OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
+        BeanUtils.copyProperties(invoiceBillOrderDO, lockFieldVO);
+        return OrderFieldLockApplyDO.builder()
+                .applyUserId(userId)
+                .auditUserId(null)
+                .fields(JSONObject.toJSONString(lockFieldVO))
+                .orderId(invoiceBillOrderDO.getId())
+                .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .build();
+    }
+
+    /**
      * 通过主键删除数据
      *
      * @param invoiceBillOrderQueryVO 筛选条件
@@ -72,6 +72,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderInspectionStageService inspectionStageService;
+    @Resource
+    private InvoiceBillOrderService invoiceBillOrderService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -336,7 +339,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
         if (Objects.isNull(roleSelect)) {
             queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
-        }else {
+        } else {
             queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
         }
@@ -395,7 +398,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         } else if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(applyDO.getType())) {
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
+        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
+            InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
+            invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }
+
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_REFUSE.getDesc()).build();
         applyService.updateById(applyDO);
@@ -516,6 +524,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
+        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
+            InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_PASS.getDesc()).build();