Merge remote-tracking branch 'origin/main'

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<String> sliderPicUrls;

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<Integer> {
 
     EXPRESS(1, "快递发货"),
-    PICK_UP(2, "用户自提"),;
+    PICK_UP(2, "用户自提"),
+    DOOR(3, "自提柜"),
+    ;
 
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(DeliveryTypeEnum::getType).toArray(Integer[]::new);
 

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())) {
+
         }
     }