diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentSaveVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentSaveVO.java index 502e7353..e0b8ea36 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentSaveVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentSaveVO.java @@ -14,6 +14,9 @@ public class FinancialPaymentSaveVO { @Schema(description = "状态 1同意 2拒绝", example = "1") private Integer status; + @Schema(description = "类型 1全额支付 2分批支付", example = "1") + private Integer type; + @Schema(description = "支付信息") private FinancialPaymentItemSaveReqVO financialPaymentItemSaveReqVO; } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java index b852e66d..727b247b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/financialpaymentitem/FinancialPaymentItemDO.java @@ -17,7 +17,7 @@ import java.util.List; * * @author 艾楷 */ -@TableName("bpm_financial_payment_item") +@TableName(value = "bpm_financial_payment_item", autoResultMap = true) @KeySequence("bpm_financial_payment_item_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data @EqualsAndHashCode(callSuper = true) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java index 2fec7e34..ee05fc6c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java @@ -81,10 +81,14 @@ public class FinancialPaymentServiceImpl implements FinancialPaymentService { FinancialPaymentDO financialPayment = this.getFinancialPayment(vo.getId()); if (vo.getStatus() == 1) { financialPayment.setActualPayment(financialPayment.getActualPayment().add(financialPaymentItem.getAmount())); - if (financialPayment.getActualPayment().equals(financialPayment.getAmountPayable())) { + if (vo.getType() != null && vo.getType() == 1) { financialPayment.setStatus(2); } else { - financialPayment.setStatus(1); + if (financialPayment.getActualPayment().compareTo(financialPayment.getAmountPayable()) >= 0) { + financialPayment.setStatus(2); + } else { + financialPayment.setStatus(1); + } } } else { // TODO: 2024/8/18 - 驳回该流程通过流程实例id 发消息通知发起人 - 更改状态