From 62ef4b16afb2680fa0688683ae40c0df9b2bb1c8 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 12 Feb 2024 16:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ERP=EF=BC=9A=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/purchase/vo/in/ErpPurchaseInRespVO.java | 4 ++-- .../admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java | 6 +++--- .../module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java | 4 ++-- .../erp/service/purchase/ErpPurchaseInServiceImpl.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java index ce16cf57a..fe6a31010 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java @@ -68,8 +68,8 @@ public class ErpPurchaseInRespVO { @Schema(description = "定金金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127") private BigDecimal otherPrice; - @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127") - private BigDecimal payPrice; + @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127") + private BigDecimal refundPrice; @Schema(description = "本次欠款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "666") private BigDecimal debtPrice; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java index dd1543d5b..64dbac499 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java @@ -32,9 +32,9 @@ public class ErpPurchaseInSaveReqVO { @Schema(description = "其它金额，单位：元", example = "7127") private BigDecimal otherPrice; - @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127") - @NotNull(message = "本次收款不能为空") - private BigDecimal payPrice; + @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127") + @NotNull(message = "本次付款不能为空") + private BigDecimal refundPrice; @Schema(description = "附件地址", example = "https://www.iocoder.cn") private String fileUrl; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java index 7fd4c1c4e..51dc90f59 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java @@ -107,9 +107,9 @@ public class ErpPurchaseInDO extends BaseDO { /** * 本次收款，单位：元 * - * payPrice = totalPrice + otherPrice - debtPrice + * refundPrice = totalPrice + otherPrice - debtPrice */ - private BigDecimal payPrice; + private BigDecimal refundPrice; /** * 本次欠款，单位：元 */ diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java index 58a3e2bb0..24209a55a 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java @@ -143,7 +143,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService { purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice())); // 计算应收金额 BigDecimal allPrice = purchaseIn.getTotalPrice().add(purchaseIn.getOtherPrice()); - purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getPayPrice())); + purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getRefundPrice())); } private void updatePurchaseOrderInCount(Long orderId) {