From d50a31d04489c22dc664d7fef133ba5fbe5d4f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Mon, 23 Mar 2026 09:33:32 +0000 Subject: [PATCH] Merge #70 into master from cc_20260323_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat：数量可以为0 * cc_20260323_fix: (2 commits squashed) - feat：数量可以为0 - feat：数量可以为0 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/70 --- .../request/order/PCStoreOrderOptionQuantityUpdateRequest.java | 1 - .../store/service/order/impl/MiniStoreOrderServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/order/PCStoreOrderOptionQuantityUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/order/PCStoreOrderOptionQuantityUpdateRequest.java index 6bc50785e..3caf16fe2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/order/PCStoreOrderOptionQuantityUpdateRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/order/PCStoreOrderOptionQuantityUpdateRequest.java @@ -29,7 +29,6 @@ public class PCStoreOrderOptionQuantityUpdateRequest { @ApiModelProperty(value = "数量", required = true) @NotNull(message = "数量不能为空") - @DecimalMin(value = "0.01", message = "数量必须大于0") private BigDecimal quantity; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java index 2792f3b12..ef3c7108a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/order/impl/MiniStoreOrderServiceImpl.java @@ -1202,7 +1202,7 @@ public class MiniStoreOrderServiceImpl implements MiniStoreOrderService { List batchUpdateList = new ArrayList<>(); for (PCStoreOrderOptionQuantityUpdateRequest.SelectedOption selected : request.getSelectedOptions()) { if (selected == null || selected.getOptionId() == null || selected.getQuantity() == null - || selected.getQuantity().compareTo(BigDecimal.ZERO) <= 0) { + || selected.getQuantity().compareTo(BigDecimal.ZERO) < 0) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); }