diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java index 8bda00fdd..e40ce0db6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdCreateVO.java @@ -134,14 +134,21 @@ public class StoreProdCreateVO { @NotBlank(message = "帮面材质不可为空!") @ApiModelProperty(value = "帮面材质", required = true) private String upperMaterial; - @NotBlank(message = "内里材质不可为空!") - @ApiModelProperty(value = "内里材质", required = true) - private String liningMaterial; @NotBlank(message = "鞋垫材质不可为空!") @ApiModelProperty(value = "鞋垫材质", required = true) private String insoleMaterial; @ApiModelProperty(value = "上市季节年份") private String releaseYearSeason; + @ApiModelProperty(value = "靴筒内里材质") + private String shaftLiningMaterial; + @ApiModelProperty(value = "靴筒面材质") + private String shaftMaterial; + @ApiModelProperty(value = "鞋面内里材质") + private String shoeUpperLiningMaterial; + @ApiModelProperty(value = "靴款品名") + private String shoeStyleName; + @ApiModelProperty(value = "筒高") + private String shaftHeight; @ApiModelProperty(value = "后跟高") private String heelHeight; @ApiModelProperty(value = "跟底款式") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java index 8b19d7c19..922aad185 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdResVO.java @@ -97,12 +97,20 @@ public class StoreProdResVO { public static class StoreProdCateAttrVO { @ApiModelProperty(value = "帮面材质") private String upperMaterial; - @ApiModelProperty(value = "内里材质") - private String liningMaterial; @ApiModelProperty(value = "鞋垫材质") private String insoleMaterial; @ApiModelProperty(value = "上市季节年份") private String releaseYearSeason; + @ApiModelProperty(value = "靴筒内里材质") + private String shaftLiningMaterial; + @ApiModelProperty(value = "靴筒面材质") + private String shaftMaterial; + @ApiModelProperty(value = "鞋面内里材质") + private String shoeUpperLiningMaterial; + @ApiModelProperty(value = "靴款品名") + private String shoeStyleName; + @ApiModelProperty(value = "筒高") + private String shaftHeight; @ApiModelProperty(value = "后跟高") private String heelHeight; @ApiModelProperty(value = "跟底款式") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 26b8bd775..7f0a9f77d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -318,7 +318,14 @@ public class Constants public static final BigDecimal ALI_SERVICE_FEE_RATE = BigDecimal.valueOf(0.006); public static final String UPPER_MATERIAL = "upperMaterial"; - public static final String LINING_MATERIAL = "liningMaterial"; + public static final String SHAFT_LINING_MATERIAL = "shaftLiningMaterial"; + public static final String SHAFT_MATERIAL = "shaftMaterial"; + public static final String SHOE_UPPER_LINING_MATERIAL = "shoeUpperLiningMaterial"; + public static final String SHOE_STYLE_NAME = "shoeStyleName"; + public static final String SHAFT_HEIGHT = "shaftHeight"; + + + public static final String INSOLE_MATERIAL = "insoleMaterial"; public static final String RELEASE_YEAR_SEASON = "releaseYearSeason"; public static final String HEEL_HEIGHT = "heelHeight"; @@ -344,7 +351,11 @@ public class Constants */ public static final Map CATE_RELATE_MAP = new ConcurrentHashMap() {{ put(UPPER_MATERIAL, "帮面材质"); - put(LINING_MATERIAL, "内里材质"); + put(SHAFT_LINING_MATERIAL, "靴筒内里材质"); + put(SHAFT_MATERIAL, "靴筒面材质"); + put(SHOE_UPPER_LINING_MATERIAL, "鞋面内里材质"); + put(SHOE_STYLE_NAME, "靴款品名"); + put(SHAFT_HEIGHT, "筒高"); put(INSOLE_MATERIAL, "鞋垫材质"); put(RELEASE_YEAR_SEASON, "上市季节年份"); put(HEEL_HEIGHT, "后跟高"); diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java index 319c3b40d..358117692 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java @@ -37,9 +37,25 @@ public class StoreProductCategoryAttribute extends XktBaseEntity { */ private String upperMaterial; /** - * 内里材质 + * 靴筒内里材质 */ - private String liningMaterial; + private String shaftLiningMaterial; + /** + * 靴筒面材质 + */ + private String shaftMaterial; + /** + * 鞋面内里材质 + */ + private String shoeUpperLiningMaterial; + /** + * 靴款品名 + */ + private String shoeStyleName; + /** + * 筒高 + */ + private String shaftHeight; /** * 鞋垫材质 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdCateAttr/StoreProdCateAttrDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdCateAttr/StoreProdCateAttrDTO.java index a95fe31b1..b6c84b28a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdCateAttr/StoreProdCateAttrDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdCateAttr/StoreProdCateAttrDTO.java @@ -15,12 +15,20 @@ public class StoreProdCateAttrDTO { @ApiModelProperty(value = "帮面材质") private String upperMaterial; - @ApiModelProperty(value = "内里材质") - private String liningMaterial; @ApiModelProperty(value = "鞋垫材质") private String insoleMaterial; @ApiModelProperty(value = "上市季节年份") private String releaseYearSeason; + @ApiModelProperty(value = "靴筒内里材质") + private String shaftLiningMaterial; + @ApiModelProperty(value = "靴筒面材质") + private String shaftMaterial; + @ApiModelProperty(value = "鞋面内里材质") + private String shoeUpperLiningMaterial; + @ApiModelProperty(value = "靴款品名") + private String shoeStyleName; + @ApiModelProperty(value = "筒高") + private String shaftHeight; @ApiModelProperty(value = "后跟高") private String heelHeight; @ApiModelProperty(value = "跟底款式") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index ba65bae1f..abe7e416a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -1375,9 +1375,25 @@ public class StoreProductServiceImpl implements IStoreProductService { if (ObjectUtils.isNotEmpty(cateAttr.getUpperMaterial())) { cateAttrMap.put(Constants.CATE_RELATE_MAP.get(UPPER_MATERIAL), cateAttr.getUpperMaterial()); } - // 2. 内里材质 - if (ObjectUtils.isNotEmpty(cateAttr.getLiningMaterial())) { - cateAttrMap.put(Constants.CATE_RELATE_MAP.get(LINING_MATERIAL), cateAttr.getLiningMaterial()); + // 2. 靴筒内里材质 + if (ObjectUtils.isNotEmpty(cateAttr.getShaftLiningMaterial())) { + cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_LINING_MATERIAL), cateAttr.getShaftLiningMaterial()); + } + // 靴筒面材质 + if (ObjectUtils.isNotEmpty(cateAttr.getShaftMaterial())) { + cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_MATERIAL), cateAttr.getShaftMaterial()); + } + // 鞋面内里材质 + if (ObjectUtils.isNotEmpty(cateAttr.getShoeUpperLiningMaterial())) { + cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHOE_UPPER_LINING_MATERIAL), cateAttr.getShoeUpperLiningMaterial()); + } + // 靴款品名 + if (ObjectUtils.isNotEmpty(cateAttr.getShoeStyleName())) { + cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHOE_STYLE_NAME), cateAttr.getShoeStyleName()); + } + // 筒高 + if (ObjectUtils.isNotEmpty(cateAttr.getShaftHeight())) { + cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_HEIGHT), cateAttr.getShaftHeight()); } // 3. 鞋垫材质 if (ObjectUtils.isNotEmpty(cateAttr.getInsoleMaterial())) {