规格回收站bug

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdServiceVO.java

@@ -1,6 +1,7 @@
 package com.tashow.cloud.productapi.api.product.vo.prod;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tashow.cloud.productapi.api.product.vo.prodadditionalfeedates.ProdAdditionalFeeBlackVO;
 import com.tashow.cloud.productapi.api.product.vo.prodemergencyresponse.ProdEmergencyInfoVO;
 import com.tashow.cloud.productapi.api.product.vo.prodreservationconfig.ProdReservationInfoVO;
 import com.tashow.cloud.productapi.api.product.vo.prodserviceareas.ProdServiceAreasInfoVO;
@@ -9,8 +10,10 @@ import com.tashow.cloud.productapi.api.product.vo.prodweightrangeprices.ProdWeig
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Schema(description = "商品服务配置 VO")
@@ -48,6 +51,22 @@ public class ProdServiceVO {
     @Schema(description = "预约配置")
     public ProdReservationInfoVO prodReservationConfig;
 
+   /* public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
+        if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
+            return prodReservationBlackList;
+        }
+        return prodReservationBlackList.stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
+        this.prodReservationBlackList = prodReservationBlackList;
+    }*/
+
+
+
+
     @Schema(description = "是否紧急响应服务0关1开")
     private Integer emergencySwitch;
     @Schema(description = "急响应服务配置")
@@ -75,29 +94,26 @@ public class ProdServiceVO {
     @Schema(description = "体重配置")
     public ProdWeightRangePricesSaveInfoVO prodWeightConfig;
 
-    public List<ProdAdditionalFeeDatesDO> getProdAdditionalFeeDatesList() {
-        if (prodAdditionalFeeDatesList == null) {
-            return null; // 或者 return Collections.emptyList(); 根据你希望 null 还是 []d
+
+    public ProdReservationInfoVO getProdReservationConfig() {
+
+        if (this.prodReservationConfig == null) {
+            return null;
         }
-        return prodAdditionalFeeDatesList.stream()
-                .filter(black -> black != null && !black.isEmpty())
-                .collect(Collectors.toList());
-    }
-
-    public void setProdAdditionalFeeDatesList(List<ProdAdditionalFeeDatesDO> prodAdditionalFeeDatesList) {
-        this.prodAdditionalFeeDatesList = prodAdditionalFeeDatesList;
-    }
-
-    public List<ProdAdditionalFeePeriodsDO> getProdAdditionalFeePeriodsList() {
-        if (prodAdditionalFeePeriodsList == null) {
-            return null; // 或者 return Collections.emptyList(); 根据你希望 null 还是 []d
+        // 判断是否“逻辑上为空”
+        if (isProdReservationInfoEmpty(this.prodReservationConfig)) {
+            return null;
         }
-        return prodAdditionalFeePeriodsList.stream()
-                .filter(black -> black != null && !black.isEmpty())
-                .collect(Collectors.toList());
+        return this.prodReservationConfig;
     }
 
-    public void setProdAdditionalFeePeriodsList(List<ProdAdditionalFeePeriodsDO> prodAdditionalFeePeriodsList) {
-        this.prodAdditionalFeePeriodsList = prodAdditionalFeePeriodsList;
+    public void setProdReservationConfig(ProdReservationInfoVO prodReservationConfig) {
+        this.prodReservationConfig = prodReservationConfig;
+    }
+
+    private boolean isProdReservationInfoEmpty(ProdReservationInfoVO config) {
+        if (config == null) return true;
+        // 判断所有字段是否都为 null 或空
+        return config.getId() == null;
     }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodemergencyresponse/ProdEmergencyInfoVO.java

@@ -36,31 +36,4 @@ public class ProdEmergencyInfoVO {
 
     @Schema(description = "紧急响应黑名单日期设置")
     public List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList;
-
-    public List<ProdEmergencyResponseIntervalsDO> getProdEmergencyResponseIntervalsList() {
-        if (prodEmergencyResponseIntervalsList == null) {
-            return null; // 或者 return Collections.emptyList(); 根据你希望 null 还是 []
-        }
-        return prodEmergencyResponseIntervalsList.stream()
-                .filter(black -> black != null && !black.isEmpty())
-                .collect(Collectors.toList());
-    }
-
-    public void setProdEmergencyResponseIntervalsList(List<ProdEmergencyResponseIntervalsDO> prodEmergencyResponseIntervalsList) {
-        this.prodEmergencyResponseIntervalsList = prodEmergencyResponseIntervalsList;
-    }
-
-    // getter 中做转换
-    public List<ProdAdditionalFeeBlackVO> getProdEmergencyResponseBlackList() {
-        if (prodEmergencyResponseBlackList == null) {
-            return null; // 或者 return Collections.emptyList(); 根据你希望 null 还是 []
-        }
-        return prodEmergencyResponseBlackList.stream()
-                .filter(black -> black != null && !black.isEmpty())
-                .collect(Collectors.toList());
-    }
-
-    public void setProdEmergencyResponseBlackList(List<ProdAdditionalFeeBlackVO> prodEmergencyResponseBlackList) {
-        this.prodEmergencyResponseBlackList = prodEmergencyResponseBlackList;
-    }
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prodreservationconfig/ProdReservationInfoVO.java

@@ -9,6 +9,7 @@ import com.tashow.cloud.productapi.general.StringListTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -81,18 +82,22 @@ public class ProdReservationInfoVO {
     @Schema(description = "预约黑名单日期设置")
     public List<ProdAdditionalFeeBlackVO> prodReservationBlackList;
 
-    public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
+
+/*    public List<ProdAdditionalFeeBlackVO> getProdReservationBlackList() {
         if (prodReservationBlackList == null || prodReservationBlackList.isEmpty()) {
             return prodReservationBlackList;
         }
         return prodReservationBlackList.stream()
-                .filter(Objects::nonNull)
-                .filter(black -> !black.isEmpty())
+                .filter(black -> black != null && !black.isEmpty())
                 .collect(Collectors.toList());
     }
 
     public void setProdReservationBlackList(List<ProdAdditionalFeeBlackVO> prodReservationBlackList) {
         this.prodReservationBlackList = prodReservationBlackList;
-    }
+    }*/
+
+
+
+
 
 }

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/sku/SkuSaveReqVO.java

@@ -15,7 +15,6 @@ public class SkuSaveReqVO {
     private Long skuId;
 
     @Schema(description = "商品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "18784")
-    @NotNull(message = "商品ID不能为空")
     private Long prodId;
 
     @Schema(description = "销售属性组合字符串 格式是p1:v1;p2:v2")
@@ -86,7 +85,6 @@ public class SkuSaveReqVO {
     private String prodName;
 
     @Schema(description = "版本号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "版本号不能为空")
     private Integer version;
 
     @Schema(description = "商品重量")
@@ -103,6 +101,11 @@ public class SkuSaveReqVO {
 
     @Schema(description = "最小购买数量")
     private Integer moq;
+    /**
+     * 是否默认规则0否1是
+     */
+    private Integer isSpecs;
+
     /**
      * 扩展服务表单id
      */