商家分类

src/main/java/com/izouma/dingdong/domain/merchant/MerchantClassification.java

@@ -38,17 +38,6 @@ public class MerchantClassification extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "商户ID", name = "merchantId")
     private Long merchantId;
 
-/*    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
-    @JoinTable(
-            name = "goods_class",
-            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "merchantId", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
-            inverseJoinColumns = {@JoinColumn(name = "class_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
-    @BatchSize(size = 20)
-    @ApiModelProperty(value = "商品列表", name = "goodsList")
-    private Set<Goods> goodsList;*/
-
-//    @Convert(converter = LongArrayConverter.class)
-//    private List<Long> goodsIds ;
 
     private String goodsIds;
 
@@ -58,4 +47,9 @@ public class MerchantClassification extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示", name = "isShow")
     private Boolean isShow;
 
+    /**
+     * 分类类型： 1 好评热销 2 折扣 3 点单必读 4 商家自定义
+     */
+    @ApiModelProperty(value = "分类类型")
+    private Integer type;
 }

src/main/java/com/izouma/dingdong/service/merchant/MerchantClassificationService.java

@@ -44,6 +44,7 @@ public class MerchantClassificationService {
                 .name(classification.getName())
                 .goodsIds(classification.getGoodsIds())
                 .sort(classification.getSort())
+                .type(4)
                 .build();
 
         //根据用户ID设置商户ID

src/main/java/com/izouma/dingdong/service/merchant/MerchantService.java

@@ -108,23 +108,26 @@ public class MerchantService {
         merchantClassificationRepo.save(MerchantClassification.builder()
                 .merchantId(merchant.getId())
                 .name(Constants.CLASSIFICATION_NAME)
-                .sort(1)
+                .sort(2)
                 .isOpen(false)
                 .isShow(true)
+                .type(1)
                 .build());
         merchantClassificationRepo.save(MerchantClassification.builder()
                 .merchantId(merchant.getId())
                 .name(Constants.CLASSIFICATION_NAME2)
-                .sort(2)
+                .sort(3)
                 .isOpen(true)
                 .isShow(false)
+                .type(2)
                 .build());
-       merchantClassificationRepo.save(MerchantClassification.builder()
+        merchantClassificationRepo.save(MerchantClassification.builder()
                 .merchantId(merchant.getId())
                 .name(Constants.CLASSIFICATION_NAME3)
-                .sort(3)
+                .sort(1)
                 .isOpen(true)
                 .isShow(false)
+                .type(3)
                 .build());
 
         return merchantDTO;
@@ -235,6 +238,6 @@ public class MerchantService {
         }
         merchantSettingsRepo.save(merchant);
     }
-    
+
 
 }