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())); }