From 34bb5d5fe8a7c18b9ef33f2064444c2a7ae74bd9 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 21 Jul 2025 16:57:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AAsku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/controller/app/spu/vo/AppProductSpuRespVO.java | 4 ++++ .../yudao/module/trade/enums/delivery/DeliveryTypeEnum.java | 4 +++- .../price/calculator/TradeDeliveryPriceCalculator.java | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java index db606cc..bf4fae2 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.product.controller.app.spu.vo; +import cn.iocoder.yudao.module.product.enums.spu.ProductSpuTypesEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -23,6 +24,9 @@ public class AppProductSpuRespVO { @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED) private String picUrl; + + @Schema(description = "商品类型", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer types; @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED) private List sliderPicUrls; diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryTypeEnum.java index 0aaf388..c1b80cc 100644 --- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryTypeEnum.java +++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/delivery/DeliveryTypeEnum.java @@ -16,7 +16,9 @@ import java.util.Arrays; public enum DeliveryTypeEnum implements ArrayValuable { EXPRESS(1, "快递发货"), - PICK_UP(2, "用户自提"),; + PICK_UP(2, "用户自提"), + DOOR(3, "自提柜"), + ; public static final Integer[] ARRAYS = Arrays.stream(values()).map(DeliveryTypeEnum::getType).toArray(Integer[]::new); diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java index 0f5152e..f056928 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java @@ -65,6 +65,8 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator { calculateByPickUp(param); } else if (DeliveryTypeEnum.EXPRESS.getType().equals(param.getDeliveryType())) { calculateExpress(param, result); + } else if (DeliveryTypeEnum.DOOR.getType().equals(param.getDeliveryType())) { + } }