From 0aa5d386832f7cc5402a3e25ea2d897bf982058e Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 22 Sep 2025 15:20:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=AE=9A=E4=BB=B7?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=8A=98=E6=89=A3=E9=99=90=E5=88=B6=E4=B8=BA?= =?UTF-8?q?=E6=95=B4=E6=95=B0=EF=BC=9B2=E3=80=81=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=94=AF=E4=BB=98=E7=9A=84=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E5=BA=9F=E6=97=A7=E6=94=AF=E4=BB=98=E4=B8=AD?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95=E7=8A=B6=E6=80=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../products/vo/productDetails/ProductDetailsSaveReqVO.java | 2 ++ .../system/service/funds/purchase/PurchaseServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsSaveReqVO.java index a5b902d99..5e4011988 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsSaveReqVO.java @@ -6,6 +6,7 @@ import com.cf.imes.module.system.validation.products.ProductType; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.DecimalMax; import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Digits; import lombok.Data; import jakarta.validation.constraints.NotNull; @@ -55,6 +56,7 @@ public class ProductDetailsSaveReqVO { @Schema(description = "折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "0.8") @DecimalMax(value = "100", message = "折扣必须小于等于100") @DecimalMin(value = "0", message = "折扣必须大于等于0") + @Digits(integer = 3, fraction = 0, message = "折扣必须是0 ~ 100间的整数") private BigDecimal discount; @Schema(description = "产品现价", requiredMode = Schema.RequiredMode.REQUIRED, example = "80") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index a834e828c..78a171516 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -350,7 +350,7 @@ public class PurchaseServiceImpl implements PurchaseService { purchaseRecordMapper.update(new LambdaUpdateWrapper() .eq(PurchaseRecordDO::getOrganId, organId) .eq(PurchaseRecordDO::getId, purchaseRecordId) - .eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.ACTIVE.getStatus()) + .eq(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.PENDING.getStatus()) .eq(PurchaseRecordDO::getDeleted, false) .set(PurchaseRecordDO::getStatus, PurchaseRecordStatusEnum.INACTIVE.getStatus())); }