From 25a41cf79f573006d621d4efcd8abc9c1501bd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= Date: Fri, 21 Jun 2024 14:50:19 +0800 Subject: [PATCH] =?UTF-8?q?hotfix(20240617-workspace):=20=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=89=88=E6=9C=AC=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0version=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/model/res/WorkspaceProductResp.java | 5 +++++ .../axzo/tyr/server/service/impl/ProductServiceImpl.java | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/WorkspaceProductResp.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/WorkspaceProductResp.java index bb0c7074..630fac9c 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/WorkspaceProductResp.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/WorkspaceProductResp.java @@ -70,6 +70,11 @@ public class WorkspaceProductResp { */ private Integer maxWorkspaceCount; + /** + * 版本升级序列(数字越小，版本越低，不能降级，只能升级) <企业、项目产品> + */ + private Integer version; + /** * SKU列表 */ diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java index 5a81c75c..502e4511 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java @@ -252,7 +252,11 @@ public class ProductServiceImpl implements ProductService { .build()).collect(Collectors.toList())); } else { if (ProductModuleCategoryEnum.PRODUCT_VERSION.getCode().equals(k)) { - resp.getProductVersions().addAll(v.stream().map(this::buildRespProduct).filter(Objects::nonNull).collect(Collectors.toList())); + List products = v.stream().map(this::buildRespProduct).filter(Objects::nonNull).collect(Collectors.toList()); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(products)) { + products.sort(Comparator.comparing(p -> Objects.isNull(p.getVersion()) ? 0 : p.getVersion())); + } + resp.getProductVersions().addAll(products); } if (ProductModuleCategoryEnum.ADD_VALUE_SERVICE.getCode().equals(k)) { resp.getAddValueServices().addAll(v.stream().map(this::buildRespProduct).filter(Objects::nonNull).collect(Collectors.toList())); @@ -372,6 +376,7 @@ public class ProductServiceImpl implements ProductService { .productName(e.getProductName()) .maxPersonCount(e.getMaxPersonCount()) .maxWorkspaceCount(e.getMaxWorkspaceCount()) + .version(e.getVersion()) .skus(CollectionUtil.isNotEmpty(e.getSkus()) ? e.getSkus().stream().map(s -> WorkspaceProductResp.Sku .builder() .skuName(s.getSkuName())