属性管理

platform-admin/src/main/java/com/platform/controller/AttributesController.java

@@ -288,6 +288,7 @@ public class AttributesController {
 //            param.setAttrId(attributes.getId());
 //            paramList.add(param);
 //        });
+        List<AttributesEntity> list = attributesService.queryList(null);
         List<TbCfItemParamEntity> paramList = itemParamService.queryParamByItemId(itemId);
         List<TbCfItemParamEntity> collect = paramList.stream()
                 .filter(p -> StringUtils.isNotBlank(p.getAttrId()))
@@ -298,7 +299,8 @@ public class AttributesController {
             AttributesEntity attr = attributesService.queryObject(param.getAttrId());
             if (attr != null && "1".equals(attr.getStatus().toString())) {
                 param.setAttrId(attr.getId());
-
+                param.setNeed(attr.isNeed());
+                param.setParamName(attr.getAttrName());
                 String[] arr = param.getAttrDescId().split(",");
                 List<AttributesDescEntity> descEntities = attributesDescService.queryDescByIds(arr);
 
@@ -317,7 +319,19 @@ public class AttributesController {
             }
 
         });
-
+        List<String> ids = collect.stream().map(TbCfItemParamEntity::getAttrId).collect(Collectors.toList());
+        List<TbCfItemParamEntity> extraList = new ArrayList();
+        list.stream().filter(s -> s.getStatus() == 1 && !ids.contains(s.getId()))
+                .forEach(s -> {
+
+            TbCfItemParamEntity param = new TbCfItemParamEntity();
+            param.setAttrId(s.getId());
+            param.setNeed(s.isNeed());
+            param.setItemId(itemId);
+            param.setParamName(s.getAttrName());
+            extraList.add(param);
+        });
+        collect.addAll(extraList);
 //        collect.forEach(p -> {
 //            p.setParamName(null);
 //            p.setParamValue(null);

platform-admin/src/main/java/com/platform/entity/TbCfItemParamEntity.java

@@ -51,6 +51,16 @@ public class TbCfItemParamEntity implements Serializable {
 
     private String descValue;
 
+    private boolean isNeed;
+
+    public boolean isNeed() {
+        return isNeed;
+    }
+
+    public void setNeed(boolean need) {
+        isNeed = need;
+    }
+
     public String getDescValue() {
         return descValue;
     }
@@ -72,6 +82,7 @@ public class TbCfItemParamEntity implements Serializable {
     public String getId() {
         return id;
     }
+
     /**
      * 设置：参数名
      */
@@ -85,6 +96,7 @@ public class TbCfItemParamEntity implements Serializable {
     public String getParamName() {
         return paramName;
     }
+
     /**
      * 设置：参数值
      */
@@ -98,6 +110,7 @@ public class TbCfItemParamEntity implements Serializable {
     public String getParamValue() {
         return paramValue;
     }
+
     /**
      * 设置：商品ID
      */
@@ -111,6 +124,7 @@ public class TbCfItemParamEntity implements Serializable {
     public String getItemId() {
         return itemId;
     }
+
     /**
      * 设置：创建时间
      */
@@ -124,6 +138,7 @@ public class TbCfItemParamEntity implements Serializable {
     public Date getCreateTime() {
         return createTime;
     }
+
     /**
      * 设置：更新时间
      */
@@ -137,6 +152,7 @@ public class TbCfItemParamEntity implements Serializable {
     public Date getUpdateTime() {
         return updateTime;
     }
+
     /**
      * 设置：属性ID
      */
@@ -150,6 +166,7 @@ public class TbCfItemParamEntity implements Serializable {
     public String getAttrId() {
         return attrId;
     }
+
     /**
      * 设置：属性描述ID
      */