feat: ERP升级

1、财务应收创建invoice单据/列表查询/删除/更新操作

feat: ERP升级
1、财务应收创建invoice单据/列表查询/删除/更新操作
谢茂盛
1 parent c0757c2b
Showing 9 changed files with 463 additions and 128 deletions
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBaseOrderQueryVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAmountInfoVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCreateVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillDeductInfoVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderVO.java
src/main/java/com/order/erp/service/order/InvoiceBillOrderService.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
@@ -2,8 +2,7 @@ package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.jsr303.OperateGroup;
-import com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO;
-import com.order.erp.domain.vo.order.InvoiceBillOrderVO;
+import com.order.erp.domain.vo.order.*;
 import com.order.erp.service.order.InvoiceBillOrderService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +19,7 @@ import javax.annotation.Resource;
  * @since 2024-08-05 16:26:34
  */
 @RestController
-@RequestMapping("/order/erp/invoice_bill/")
+@RequestMapping("/order/erp/invoice_bill")
 public class InvoiceBillOrderController {
     /**
      * 服务对象
@@ -34,42 +33,54 @@ public class InvoiceBillOrderController {
      * @param invoiceBillOrderQueryVO 查询条件
      * @return 查询结果
      */
-    @PostMapping("/list")
-    public ServerResult list(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
-        return invoiceBillOrderService.list(invoiceBillOrderQueryVO);
+    @PostMapping("/list_by_page")
+    public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.listByPage(invoiceBillOrderQueryVO);
     }
     /**
-     * 通过主键查询单条数据
+     * 基础订单查询
      *
-     * @param invoiceBillOrderQueryVO 查询条件
-     * @return 单条数据
+     * @param queryVO 查询条件
+     * @return 查询结果
      */
-    @PostMapping("/query_by_id")
-    public ServerResult queryById(@RequestBody InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
-        return invoiceBillOrderService.queryById(invoiceBillOrderQueryVO);
+    @PostMapping("/list_base_order_info_by")
+    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBaseOrderQueryVO queryVO) {
+        return invoiceBillOrderService.listBaseOrderInfoBy(queryVO);
     }
+
     /**
-     * 新增数据
+     * 创建invoice单据
      *
-     * @param invoiceBillOrderVO 数据VO
+     * @param createVO 数据VO
      * @return 新增结果
      */
-    @PostMapping("/add")
-    public ServerResult add(@RequestBody InvoiceBillOrderVO invoiceBillOrderVO) {
-        return invoiceBillOrderService.add(invoiceBillOrderVO);
+    @PostMapping("/create")
+    public ServerResult create(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.create(createVO);
+    }
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_deduct_info")
+    public ServerResult updateDeductInfo(@RequestBody InvoiceBillDeductInfoVO deductInfoVO) {
+        return invoiceBillOrderService.updateDeductInfo(deductInfoVO);
     }
     /**
-     * 编辑数据
+     * 更新其他金额信息
      *
-     * @param invoiceBillOrderVO 数据VO
+     * @param amountInfoVO 数据VO
      * @return 编辑结果
      */
-    @PostMapping("/edit")
-    public ServerResult edit(@RequestBody InvoiceBillOrderVO invoiceBillOrderVO) {
-        return invoiceBillOrderService.edit(invoiceBillOrderVO);
+    @PostMapping("/update_amount_info")
+    public ServerResult updateAmountInfo(@RequestBody InvoiceBillAmountInfoVO amountInfoVO) {
+        return invoiceBillOrderService.updateAmountInfo(amountInfoVO);
     }
     /**
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBaseOrderQueryVO extends BasePageVO implements Serializable {
+
+    /**
+     * 发票单号
+     */
+    @NotBlank(message = "发票单号不能为空")
+    private String invoiceNo;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 其他金额信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAmountInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCreateVO implements Serializable {
+    private static final long serialVersionUID = 543899167451834300L;
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 订单id集合
+     */
+    private List<Long> orderIds;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 扣款信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillDeductInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+}
@@ -23,53 +23,39 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
     private List<Long> ids;
-
-    private Long id;
     /**
      * 发票单号
      */
     private String invoiceNo;
+
     /**
-     * 报关单url地址
-     */
-    private String bgUrl;
-    /**
-     * 必须回款日期
-     */
-    private String backRefundDate;
-    /**
-     * 发生扣款金额
-     */
-    private Double deductAmount;
-    /**
-     * 扣款单url地址
-     */
-    private String deductUrl;
-    /**
-     * 实际应收金额
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
      */
-    private Double actualReceivableAmount;
+    private Integer status;
+
     /**
-     * 实际应付金额1
+     * 客户编码
      */
-    private Double actualPayedAmount1;
+    private String customerCode;
+
     /**
-     * 实际应付金额2
+     * 项目号
      */
-    private Double actualPayedAmount2;
+    private String projectNo;
+
     /**
-     * 实际应付金额3
+     * 生产科
      */
-    private Double actualPayedAmount3;
+    private String productionDepartment;
+
     /**
-     * 其他费用金额
+     * 内部编号
      */
-    private Double otherAmount;
+    private String innerNo;
+
     /**
-     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     * 客户po号
      */
-    private Integer status;
-
-
+    private String customerPo;
 }
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.math.BigDecimal;
 /**
  * 应收款账单表(InvoiceBillOrder)实体类
@@ -21,46 +22,57 @@ public class InvoiceBillOrderVO implements Serializable {
     private static final long serialVersionUID = 543899167451834300L;
     private Long id;
+
     /**
      * 发票单号
      */
     private String invoiceNo;
+
     /**
      * 报关单url地址
      */
     private String bgUrl;
+
     /**
      * 必须回款日期
      */
     private String backRefundDate;
+
     /**
      * 发生扣款金额
      */
-    private Double deductAmount;
+    private BigDecimal deductAmount;
+
     /**
      * 扣款单url地址
      */
     private String deductUrl;
+
     /**
      * 实际应收金额
      */
-    private Double actualReceivableAmount;
+    private BigDecimal actualReceivableAmount;
+
     /**
      * 实际应付金额1
      */
-    private Double actualPayedAmount1;
+    private BigDecimal actualPayedAmount1;
+
     /**
      * 实际应付金额2
      */
-    private Double actualPayedAmount2;
+    private BigDecimal actualPayedAmount2;
+
     /**
      * 实际应付金额3
      */
-    private Double actualPayedAmount3;
+    private BigDecimal actualPayedAmount3;
+
     /**
      * 其他费用金额
      */
-    private Double otherAmount;
+    private BigDecimal otherAmount;
+
     /**
      * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
      */
@@ -3,8 +3,7 @@ package com.order.erp.service.order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
-import com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO;
-import com.order.erp.domain.vo.order.InvoiceBillOrderVO;
+import com.order.erp.domain.vo.order.*;
 /**
  * 应收款账单表(InvoiceBillOrder)表服务接口
@@ -15,36 +14,42 @@ import com.order.erp.domain.vo.order.InvoiceBillOrderVO;
 public interface InvoiceBillOrderService extends IService<InvoiceBillOrderDO> {
     /**
-     * 通过ID查询单条数据
-     *
-     * @param invoiceBillOrderQueryVO 主键
-     * @return 实例对象
-     */
-    ServerResult queryById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
-
-    /**
      * 分页查询
      *
      * @param invoiceBillOrderQueryVO 筛选条件
      * @return 查询结果
      */
-    ServerResult list(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+    ServerResult listByPage(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO);
     /**
      * 新增数据
      *
-     * @param invoiceBillOrderVO 数据VO
+     * @param createVO 数据VO
      * @return 新增结果
      */
-    ServerResult add(InvoiceBillOrderVO invoiceBillOrderVO);
+    ServerResult create(InvoiceBillCreateVO createVO);
     /**
-     * 修改数据
+     * 更新扣款信息
      *
-     * @param invoiceBillOrderVO 数据VO
+     * @param deductInfoVO 数据VO
      * @return 编辑结果
      */
-    ServerResult edit(InvoiceBillOrderVO invoiceBillOrderVO);
+    ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO);
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO
+     * @return
+     */
+    ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO);
     /**
      * 通过主键删除数据
 package com.order.erp.service.order.impl;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
-import com.order.erp.common.utils.PageUtils;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.StringUtils;
+import com.order.erp.common.utils.TransactionHelper;
+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.vo.order.InvoiceBillOrderQueryVO;
-import com.order.erp.domain.vo.order.InvoiceBillOrderVO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Objects;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  * 应收款账单表(InvoiceBillOrder)表服务实现类
@@ -32,78 +38,225 @@ import java.util.Objects;
 public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMapper, InvoiceBillOrderDO> implements InvoiceBillOrderService {
-    /**
-     * 通过ID查询单条数据
-     * <p>
-     * invoiceBillOrderQueryVO 主键
-     *
-     * @return 实例对象
-     */
-    @Override
-    public ServerResult queryById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
-        if (Objects.isNull(invoiceBillOrderQueryVO.getId())) {
-            return ServerResult.fail("id 不能为空");
-        }
-        InvoiceBillOrderDO InvoiceBillOrderDo = getById(invoiceBillOrderQueryVO.getId());
-        if (Objects.isNull(InvoiceBillOrderDo)) {
-            return ServerResult.success(null);
-        }
-        return ServerResult.success(BeanUtil.copyProperties(InvoiceBillOrderDo, InvoiceBillOrderVO.class));
-    }
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
     /**
      * 分页查询
      *
-     * @param invoiceBillOrderQueryVO 筛选条件
+     * @param queryVO 筛选条件
      * @return 查询结果
      */
     @Override
-    public ServerResult list(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+    public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
+        Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
-        LambdaQueryWrapper<InvoiceBillOrderDO> queryWapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = 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())
                 .orderByDesc(InvoiceBillOrderDO::getId);
-        Page page = new Page<>(invoiceBillOrderQueryVO.getPage(), invoiceBillOrderQueryVO.getPageSize());
-        IPage<InvoiceBillOrderDO> iPage = page(page, queryWapper);
-        invoiceBillOrderQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
-        return ServerResult.success(PageUtils.getPageReturn(null, invoiceBillOrderQueryVO));
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
+        return ServerResult.success(iPage);
+    }
+
+    @Override
+    public ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO) {
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillMappingDO::getInvoiceNo, queryVO.getInvoiceNo()));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            return ServerResult.success();
+        }
+        Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toSet());
+        return ServerResult.success(orderBaseInfoService.listByIds(orderIds));
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private Set<Long> filterBillOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        List<Long> orderIds = filterOrderIdsBy(queryVO);
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return null;
+        }
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            Set<Long> ids = new HashSet<>();
+            ids.add(-1L);
+            return ids;
+        }
+        return mappingDOS.stream().map(InvoiceBillMappingDO::getInvoiceBillId).collect(Collectors.toSet());
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private List<Long> filterOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        Boolean flag = false;
+        if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
+            flag = flag | true;
+        }
+        if (!flag) {
+            return null;
+        }
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
+                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            List<Long> orderIds = new ArrayList<>();
+            orderIds.add(-1L);
+            return orderIds;
+        }
+        return orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
     }
     /**
-     * 新增数据
+     * 创建invoice单据
      *
-     * @param invoiceBillOrderVO 实例对象
+     * @param createVO 实例对象
      * @return 实例对象
      */
     @Override
-    public ServerResult add(InvoiceBillOrderVO invoiceBillOrderVO) {
-        //todo 校验
-        if (Objects.nonNull(invoiceBillOrderVO.getId())) {
-            invoiceBillOrderVO.setId(null);
+    public ServerResult create(InvoiceBillCreateVO createVO) {
+        if (Objects.nonNull(createVO.getId())) {
+            createVO.setId(null);
         }
-        InvoiceBillOrderDO invoiceBillOrderDo = BeanUtil.copyProperties(invoiceBillOrderVO, InvoiceBillOrderDO.class);
-        save(invoiceBillOrderDo);
+        validaBillOrder(createVO);
+
+        InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
+
+        transactionHelper.run(() -> {
+            save(invoiceBillOrderDO);
+
+            invoiceBillMappingService.saveBatch(buildInvoiceBillMappingDOS(createVO, invoiceBillOrderDO));
+        });
         return ServerResult.success();
     }
     /**
+     * @param createVO
+     * @return
+     */
+    private InvoiceBillOrderDO buildInvoiceBillOrderDO(InvoiceBillCreateVO createVO) {
+        return InvoiceBillOrderDO.builder()
+                .invoiceNo(createVO.getInvoiceNo())
+                .bgUrl(createVO.getBgUrl())
+                .backRefundDate(createVO.getBackRefundDate())
+                .build();
+    }
+
+    /**
+     * @param createVO
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private List<InvoiceBillMappingDO> buildInvoiceBillMappingDOS(InvoiceBillCreateVO createVO, InvoiceBillOrderDO invoiceBillOrderDO) {
+        return createVO.getOrderIds().stream().map(x -> {
+            return InvoiceBillMappingDO.builder()
+                    .orderId(x)
+                    .invoiceBillId(invoiceBillOrderDO.getId())
+                    .invoiceNo(invoiceBillOrderDO.getInvoiceNo())
+                    .build();
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @param createVO
+     */
+    private void validaBillOrder(InvoiceBillCreateVO createVO) {
+        if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
+            throw new BusinessException("请勾选订单！");
+        }
+
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        if (orderBaseInfoDOList.size() != createVO.getOrderIds().size()) {
+            throw new BusinessException("勾选的订单信息有误！");
+        }
+
+        String invoiceNo = createVO.getInvoiceNo();
+
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceNo));
+        if (CollectionUtils.isNotEmpty(invoiceBillOrderDOS)) {
+            throw new BusinessException("存在相同的invoice订单！");
+        }
+
+    }
+
+    /**
      * 修改数据
      *
-     * @param invoiceBillOrderVO 实例对象
+     * @param deductInfoVO 实例对象
      * @return 实例对象
      */
     @Override
-    public ServerResult edit(InvoiceBillOrderVO invoiceBillOrderVO) {
-        //todo 校验
-        if (Objects.isNull(invoiceBillOrderVO.getId())) {
-            return ServerResult.fail("id 不能为空");
+    public ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO) {
+        if (Objects.isNull(deductInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
         }
-        InvoiceBillOrderDO invoiceBillOrderDo = BeanUtil.copyProperties(invoiceBillOrderVO, InvoiceBillOrderDO.class);
-
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(deductInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+        invoiceBillOrderDo.setDeductUrl(deductInfoVO.getDeductUrl());
+        invoiceBillOrderDo.setDeductAmount(deductInfoVO.getDeductAmount());
         updateById(invoiceBillOrderDo);
+        return ServerResult.success();
+    }
+    @Override
+    public ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO) {
+        if (Objects.isNull(amountInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(amountInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+        invoiceBillOrderDo.setBgUrl(amountInfoVO.getBgUrl());
+        invoiceBillOrderDo.setActualReceivableAmount(amountInfoVO.getActualReceivableAmount());
+        invoiceBillOrderDo.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1());
+        invoiceBillOrderDo.setActualPayedAmount2(amountInfoVO.getActualPayedAmount2());
+        invoiceBillOrderDo.setActualPayedAmount3(amountInfoVO.getActualPayedAmount3());
+        invoiceBillOrderDo.setOtherAmount(amountInfoVO.getOtherAmount());
+        updateById(invoiceBillOrderDo);
         return ServerResult.success();
     }
@@ -123,11 +276,11 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (CollUtil.isEmpty(invoiceBillOrderList)) {
             return ServerResult.success();
         }
-        //todo 校验是否可以逻辑删除
-        LambdaUpdateWrapper<InvoiceBillOrderDO> updateWrapper = new LambdaUpdateWrapper<InvoiceBillOrderDO>()
-                .in(InvoiceBillOrderDO::getId, ids)
-                .set(InvoiceBillOrderDO::getEnableFlag, Constant.UNABLE_TWENTY);
-        update(updateWrapper);
+        transactionHelper.run(() -> {
+            removeByIds(ids);
+            invoiceBillMappingService.remove(new LambdaQueryWrapper<InvoiceBillMappingDO>().in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        });
+
         return ServerResult.success();
     }
 }