penghao 3 сар өмнө
parent
commit
96998e23a5

+ 2 - 2
alien-entity/src/main/java/shop/alien/entity/store/StoreInfo.java

@@ -105,11 +105,11 @@ public class StoreInfo {
     @TableField("store_status")
     private Integer storeStatus;
 
-    @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)(废弃)")
+    @ApiModelProperty(value = "经营板块id(1-特色美食,2-休闲娱乐,3-生活服务)")
     @TableField("business_section")
     private Integer businessSection;
 
-    @ApiModelProperty(value = "经营板块名称(1-特色美食,2-休闲娱乐,3-生活服务)")
+    @ApiModelProperty(value = "经营板块名称")
     @TableField("business_section_name")
     private String businessSectionName;
 

+ 5 - 5
alien-entity/src/main/java/shop/alien/entity/store/dto/StoreInfoDto.java

@@ -107,19 +107,19 @@ public class StoreInfoDto {
     @ApiModelProperty(value = "身份证")
     private String idCard;
 
-    @ApiModelProperty(value = "经营板块名称(1-特色美食,2-休闲娱乐,3-生活服务)")
+    @ApiModelProperty(value = "经营板块id(1-特色美食,2-休闲娱乐,3-生活服务)")
+    private Integer businessSection;
+
+    @ApiModelProperty(value = "经营板块名称")
     private String businessSectionName;
 
     @ApiModelProperty(value = "经营类型英文值")
     private String businessTypeValue;
 
-    @ApiModelProperty(value = "经营种类集合")
+    @ApiModelProperty(value = "经营种类集合(废弃)")
     @JsonDeserialize(using = StringToListDeserializer.class)
     private List<String> businessTypesList;
 
-    @ApiModelProperty(value = "经营板块id(词典表 键为 business_section)(废弃)")
-    private Integer businessSection;
-
     @ApiModelProperty(value = "经营种类ids(废弃)")
     @JsonDeserialize(using = StringToListDeserializer.class)
     private List<String> businessTypes;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -894,9 +894,9 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         }
         
         // 经营种类
-        if (!CollectionUtils.isEmpty(storeInfoDto.getBusinessTypes())) {
-            storeInfo.setBusinessTypes(String.join(",", storeInfoDto.getBusinessTypes()));
-        }
+        // if (!CollectionUtils.isEmpty(storeInfoDto.getBusinessTypes())) {
+        //     storeInfo.setBusinessTypes(String.join(",", storeInfoDto.getBusinessTypes()));
+        // }
         if (StringUtils.isNotEmpty(storeInfoDto.getBusinessTypeName())) {
             storeInfo.setBusinessTypeName(storeInfoDto.getBusinessTypeName());
         }