环境

pom.xml

@@ -56,6 +56,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- HUTOOL -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.2.4</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

src/main/java/com/izouma/dingdong/config/WebMvcConfig.java

@@ -36,7 +36,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
                                  .description("接口文档")
                                  .build())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.izouma.awesomeAdmin.web"))
+                .apis(RequestHandlerSelectors.basePackage("com.izouma.dingdong.web"))
                 .paths(PathSelectors.any())
                 .build();
     }

src/main/java/com/izouma/dingdong/domain/Appraisal.java

@@ -2,13 +2,13 @@ package com.izouma.dingdong.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
+import javax.persistence.*;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
@@ -17,15 +17,28 @@ public class Appraisal extends BaseEntity {
     @ApiModelProperty(value = "订单号", name = "orderId")
     private Long orderId;
 
-    @ApiModelProperty(value = "商户ID", name = "merchantId")
-    private Long merchantId;
+//    @ApiModelProperty(value = "商户ID", name = "merchantId")
+//    private Long merchantId;
+//
+//    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
+//    private String jobNumber;
+
+    @ApiModelProperty(value = "图片", name = "img")
+    private String img;
 
-    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
-    private String jobNumber;
+    @ApiModelProperty(value = "商品评分",name = "goodsScore")
+    private Integer goodsScore;
 
-    @ApiModelProperty(value = "商家评价", name = "merchantAppraise")
-    private String merchantAppraise;
+    @ApiModelProperty(value = "商品评价", name = "goodsAppraise")
+    private String goodsAppraise;
+
+    @ApiModelProperty(value = "骑手评分",name = "riderScore")
+    private Integer riderScore;
 
     @ApiModelProperty(value = "骑手评价", name = "riderAppraise")
     private String riderAppraise;
+
+    @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    @JoinColumn(name = "orderId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    private OrderInfo order;
 }

src/main/java/com/izouma/dingdong/domain/Order.java → src/main/java/com/izouma/dingdong/domain/OrderInfo.java

@@ -4,23 +4,23 @@ import com.izouma.dingdong.enums.PayMethod;
 import com.izouma.dingdong.enums.RiderStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
+@EqualsAndHashCode(callSuper = false)
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @ApiModel(value = "订单表", description = "订单表")
-public class Order extends BaseEntity {
+public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "用户ID", name = "userId")
     private Long userId;
 
@@ -30,7 +30,7 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "商户ID", name = "merchantId")
     private Long merchantId;
 
-    @ApiModelProperty(value = "商品ID",name = "goodsId")
+    @ApiModelProperty(value = "商品ID", name = "goodsId")
     private Long goodsId;
 
     @ApiModelProperty(value = "商家地址", name = "merchantAddress")
@@ -46,6 +46,9 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "总价", name = "totalAmount")
     private BigDecimal totalAmount;
 
+    @ApiModelProperty(value = "商品总价", name = "goodsAmount")
+    private BigDecimal goodsAmount;
+
     @ApiModelProperty(value = "配送费", name = "deliveryAmount")
     private BigDecimal deliveryAmount;
 
@@ -57,5 +60,21 @@ public class Order extends BaseEntity {
 
     @Column(nullable = false)
     @ApiModelProperty(value = "取消订单", name = "cancel")
-    private Boolean cancel;
+    private Boolean cancel = false;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "已评价", name = "rated")
+    private Boolean rated = false;
+
+    @ApiModelProperty(value = "下单时间", name = "orderTime")
+    private LocalDateTime orderTime;
+
+    @ApiModelProperty(value = "商家接单时间", name = "merchantOrderTime")
+    private LocalDateTime merchantOrderTime;
+
+    @ApiModelProperty(value = "骑手接单时间", name = "riderOrderTime")
+    private LocalDateTime riderOrderTime;
+
+    @ApiModelProperty(value = "用户收到时间", name = "userReceivedTime")
+    private LocalDateTime userReceivedTime;
 }

src/main/java/com/izouma/dingdong/domain/SysConfig.java

@@ -1,10 +1,7 @@
 package com.izouma.dingdong.domain;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 

src/main/java/com/izouma/dingdong/domain/User.java

@@ -7,10 +7,7 @@ import com.izouma.dingdong.config.Constants;
 import com.izouma.dingdong.security.Authority;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Where;
 
@@ -21,6 +18,7 @@ import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
+@EqualsAndHashCode(callSuper = false)
 @Data
 @Entity
 @AllArgsConstructor
@@ -76,10 +74,10 @@ public class User extends BaseEntity implements Serializable {
 /*    @ApiModelProperty(value = "身份", name = "identity")
     private String identity;*/
 
-    @ApiModelProperty(value = "合作申请",name = "apply")
+    @ApiModelProperty(value = "合作申请", name = "apply")
     private String apply;
 
     @Column(nullable = false)
     @ApiModelProperty(value = "黑名单", name = "blacklist")
-    private Boolean blacklist;
+    private Boolean blacklist = false;
 }

src/main/java/com/izouma/dingdong/domain/backstage/Category.java

@@ -3,24 +3,25 @@ package com.izouma.dingdong.domain.backstage;
 import com.izouma.dingdong.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
 
-import javax.persistence.ConstraintMode;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.List;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @ApiModel(value = "商户类别", description = "商户类别")
-public class Category extends BaseEntity {
+public class Category extends BaseEntity implements Serializable {
+    @Size(max = 30)
+    @Column(length = 30)
     @ApiModelProperty(value = "类别名称", name = "name")
     private String name;
 
@@ -28,6 +29,7 @@ public class Category extends BaseEntity {
 
     @OneToMany
     @JoinColumn(name = "parent", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @NotFound(action = NotFoundAction.IGNORE)
     @ApiModelProperty(value = "子分类",name = "children")
     private List<Category> children;
 }

src/main/java/com/izouma/dingdong/domain/backstage/Tag.java

@@ -8,13 +8,19 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.validation.constraints.Size;
+
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @ApiModel(value = "商户标签", description = "商户标签")
 public class Tag extends BaseEntity {
+    @Size(max = 30)
+    @Column(length = 30)
     @ApiModelProperty(value = "标签名称", name = "name")
     private String name;
 }

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

@@ -0,0 +1,28 @@
+package com.izouma.dingdong.domain.merchant;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.io.Serializable;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "自动回复设置")
+public class AutomaticResponse extends BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "商户ID")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "自动回复内容")
+    private String context;
+}

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

@@ -0,0 +1,29 @@
+package com.izouma.dingdong.domain.merchant;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import java.math.BigDecimal;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "满减表", description = "满减表")
+public class FullReduction extends BaseEntity {
+    @ApiModelProperty(value = "商户ID",name = "merchantSettingsId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "满额", name = "fullAmount")
+    private BigDecimal fullAmount;
+
+    @ApiModelProperty(value = "减额", name = "minusAmount")
+    private BigDecimal minusAmount;
+}

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

@@ -3,21 +3,24 @@ package com.izouma.dingdong.domain.merchant;
 import com.izouma.dingdong.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 //@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
 @ApiModel(value = "Goods", description = "商品")
-public class Goods extends BaseEntity {
+public class Goods extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "商户ID", name = "merchantId")
     private Long merchantId;
@@ -32,13 +35,16 @@ public class Goods extends BaseEntity {
     private String img;
 
     @ApiModelProperty(value = "库存", name = "inventory")
-    private int inventory;
+    private Integer inventory;
 
     @ApiModelProperty(value = "销量", name = "sales")
-    private int sales;
+    private Integer totalSales;
+
+//    @ApiModelProperty(value = "日销售额", name = "daySales")
+//    private Integer daySales;
 
     @ApiModelProperty(value = "点赞数量", name = "likes")
-    private int likes;
+    private Integer likes;
 
     @ApiModelProperty(value = "价格", name = "amount")
     private BigDecimal amount;
@@ -47,8 +53,20 @@ public class Goods extends BaseEntity {
     private BigDecimal discountAmount;
 
     @ApiModelProperty(value = "招牌", name = "signboard")
-    private Boolean signboard;
+    private Boolean signboard = false;
 
     @ApiModelProperty(value = "下架", name = "takeOff")
-    private Boolean takeOff;
+    private Boolean takeOff = false;
+
+    @ApiModelProperty(value = "排布", name = "sort")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否参与满减", name = "isFullReduction")
+    private Boolean isFullReduction = true;
+
+    @ApiModelProperty(value = "供应时间", name = "startTime")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "供应时间", name = "endTime")
+    private LocalDateTime endTime;
 }

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

@@ -5,47 +5,62 @@ import com.izouma.dingdong.domain.backstage.Category;
 import com.izouma.dingdong.domain.backstage.Tag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import org.hibernate.annotations.BatchSize;
 
-import javax.persistence.Column;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.HashSet;
 import java.util.Set;
 
 @Data
-//@Entity
+@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 //@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
-@ApiModel(value = "商户", description = "商户")
-public class Merchant extends BaseEntity {
-    @ApiModelProperty(value = "用户ID", name = "userId")
-    private Long userId;
+@ApiModel(value = "商户信息", description = "商户信息")
+public class Merchant extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "商户名称", name = "name")
     private String name;
 
+    @ApiModelProperty(value = "显示名称", name = "showName")
+    private String showName;
+
+    @ApiModelProperty(value = "商户电话", name = "phone")
+    private String phone;
+
+    @ApiModelProperty(value = "密码", name = "password")
+    private String password;
+
     @ApiModelProperty(value = "简介", name = "introduction")
     private String introduction;
 
     @ApiModelProperty(value = "图片", name = "img")
     private String img;
 
-    @ApiModelProperty(value = "类别", name = "category")
-    private Set<Category> category;
+    @Column(nullable = false)
+    @ApiModelProperty(value = "黑名单", name = "blacklist")
+    private Boolean blacklist = false;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
 
-    @ApiModelProperty(value = "标签", name = "tag")
-    private Set<Tag> tag;
+    @ApiModelProperty(value = "支付宝名称", name = "aliName")
+    private String aliName;
 
-    @ApiModelProperty(value = "优惠", name = "discount")
-    private String discount;
+    @ApiModelProperty(value = "支付宝账号", name = "aliAccount")
+    private String aliAccount;
 
-    @ApiModelProperty(value = "商户地址", name = "address")
-    private String address;
+    @ApiModelProperty(value = "总好评数量", name = "goodNum")
+    private Integer goodNum;
 
-    @Column(nullable = false)
-    @ApiModelProperty(value = "黑名单", name = "blacklist")
-    private Boolean blacklist;
-}
+    @ApiModelProperty(value = "差评数量", name = "badNum")
+    private Integer badNum;
+
+    @ApiModelProperty(value = "月销", name = "monthSales")
+    private Integer monthSales;
+}

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

@@ -0,0 +1,44 @@
+package com.izouma.dingdong.domain.merchant;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Builder
+@ApiModel(value = "商家自定义分类")
+public class MerchantClassification extends BaseEntity implements Serializable {
+    @ApiModelProperty(value = "名称", name = "name")
+    @Column(length = 50)
+    @Size(max = 50)
+    private String name;
+
+    @ApiModelProperty(value = "排序", name = "sort")
+    private Integer sort;
+
+    @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 List<Goods> goodsList;
+
+}

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

@@ -0,0 +1,68 @@
+package com.izouma.dingdong.domain.merchant;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.domain.backstage.Tag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.Set;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "商户设置", description = "商户设置")
+public class MerchantSettings extends BaseEntity {
+    @ApiModelProperty(value = "商户ID", name = "merchantId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "商户地址", name = "address")
+    private String address;
+
+    @ApiModelProperty(value = "首单优惠", name = "firstOrder")
+    private BigDecimal firstOrder;
+
+    @ApiModelProperty(value = "新用户优惠", name = "newUser")
+    private BigDecimal newUser;
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
+    @JoinTable(
+            name = "mer_cate",
+            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+            inverseJoinColumns = {@JoinColumn(name = "cate_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+    @BatchSize(size = 20)
+    @ApiModelProperty(value = "经营品类", name = "category")
+    private Set<Category> category;
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
+    @JoinTable(
+            name = "mer_tag",
+            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+            inverseJoinColumns = {@JoinColumn(name = "tag_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+    @BatchSize(size = 20)
+    @ApiModelProperty(value = "标签", name = "tag")
+    private Set<Tag> tag;
+
+    @ApiModelProperty(value = "营业时间", name = "startTime")
+    private LocalTime startTime;
+
+    @ApiModelProperty(value = "营业时间", name = "endTime")
+    private LocalTime endTime;
+
+    @ApiModelProperty(value = "营业资质", name = "qualification")
+    private String qualification;
+
+    @ApiModelProperty(value = "营业性质", name = "businessNature")
+    private String businessNature;
+}

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

@@ -0,0 +1,34 @@
+package com.izouma.dingdong.domain.merchant;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+@ApiModel(value = "Sales", description = "销售额表")
+public class Sales extends BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "商品ID")
+    private Long goodsId;
+
+    @ApiModelProperty(value = "日销售数量")
+    private Integer daySales;
+
+    @ApiModelProperty(value = "日期")
+    private LocalDate day;
+
+}

src/main/java/com/izouma/dingdong/domain/user/Address.java

@@ -3,11 +3,9 @@ package com.izouma.dingdong.domain.user;
 import com.izouma.dingdong.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

src/main/java/com/izouma/dingdong/domain/user/Coupon.java

@@ -3,18 +3,17 @@ package com.izouma.dingdong.domain.user;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.dingdong.domain.BaseEntity;
 import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.enums.CouponType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 //@Entity
 @AllArgsConstructor
@@ -45,6 +44,10 @@ public class Coupon extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "使用规则", name = "rule")
     private String rule;
 
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "优惠券类型", name = "type")
+    private CouponType type;
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @JsonIgnore

src/main/java/com/izouma/dingdong/dto/CategoryDTO.java

@@ -0,0 +1,37 @@
+package com.izouma.dingdong.dto;
+
+import cn.hutool.core.collection.CollUtil;
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.domain.merchant.Merchant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "分类信息")
+public class CategoryDTO {
+
+    @ApiModelProperty(value = "分类ID")
+    private Long id;
+
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+
+    @ApiModelProperty(value = "父级ID")
+    private Long parentId;
+
+    @ApiModelProperty(value = "下级")
+    private List<CategoryDTO> children;
+
+    @ApiModelProperty(value = "用户")
+    private List<Merchant> merchants;
+
+}

src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -0,0 +1,91 @@
+package com.izouma.dingdong.dto;
+
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.domain.backstage.Tag;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class MerchantDTO {
+    @ApiModelProperty(value = "商户名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "显示名称", name = "showName")
+    private String showName;
+
+    @ApiModelProperty(value = "商户电话", name = "phone")
+    private String phone;
+
+    @ApiModelProperty(value = "密码", name = "password")
+    private String password;
+
+    @ApiModelProperty(value = "简介", name = "introduction")
+    private String introduction;
+
+    @ApiModelProperty(value = "图片", name = "img")
+    private String img;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "黑名单", name = "blacklist")
+    private Boolean blacklist = false;
+
+    @Column(nullable = false)
+    private Boolean enabled = true;
+
+    @ApiModelProperty(value = "支付宝名称", name = "aliName")
+    private String aliName;
+
+    @ApiModelProperty(value = "支付宝账号", name = "aliAccount")
+    private String aliAccount;
+
+    @ApiModelProperty(value = "商户地址", name = "address")
+    private String address;
+
+    @ApiModelProperty(value = "首单优惠", name = "firstOrder")
+    private BigDecimal firstOrder;
+
+    @ApiModelProperty(value = "新用户优惠", name = "newUser")
+    private BigDecimal newUser;
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
+    @JoinTable(
+            name = "mer_cate",
+            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+            inverseJoinColumns = {@JoinColumn(name = "cate_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+    @BatchSize(size = 20)
+    @ApiModelProperty(value = "经营品类", name = "category")
+    private Set<Category> category;
+
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
+    @JoinTable(
+            name = "mer_tag",
+            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
+            inverseJoinColumns = {@JoinColumn(name = "tag_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
+    @BatchSize(size = 20)
+    @ApiModelProperty(value = "标签", name = "tag")
+    private Set<Tag> tag;
+
+    @ApiModelProperty(value = "营业时间", name = "startTime")
+    private LocalTime startTime;
+
+    @ApiModelProperty(value = "营业时间", name = "endTime")
+    private LocalTime endTime;
+
+    @ApiModelProperty(value = "营业资质", name = "qualification")
+    private String qualification;
+
+    @ApiModelProperty(value = "营业性质", name = "businessNature")
+    private String businessNature;
+}

src/main/java/com/izouma/dingdong/enums/CouponType.java

@@ -0,0 +1,16 @@
+package com.izouma.dingdong.enums;
+
+public enum CouponType {
+    DISCOUNT("打折"),
+    CREDIT("抵用"),
+    REDUCTION("满减");
+
+    private final String desc;
+
+    CouponType(String desc) {
+        this.desc = desc;
+    }
+    public String getDesc(){
+        return desc;
+    }
+}

src/main/java/com/izouma/dingdong/enums/PayMethod.java

@@ -1,7 +1,7 @@
 package com.izouma.dingdong.enums;
 
 public enum PayMethod {
-    ALIPAY("支付宝"),
+    ALI_PAY("支付宝"),
     CASH_DELIVERY("货到付款"),
     CREDIT_CARD("信用卡");
 

src/main/java/com/izouma/dingdong/repo/backstage/CategoryRepo.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.repo.backstage;
+
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.domain.merchant.Merchant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+
+public interface CategoryRepo extends JpaRepository<Category, Long>, JpaSpecificationExecutor<Category> {
+
+    List<Category> findAllByParent(Long parentId);
+
+}

src/main/java/com/izouma/dingdong/repo/backstage/TagRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.dingdong.repo.backstage;
+
+import com.izouma.dingdong.domain.backstage.Tag;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface TagRepo extends JpaRepository<Tag, Long>, JpaSpecificationExecutor<Tag> {
+}

src/main/java/com/izouma/dingdong/repo/merchant/GoodsRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.dingdong.repo.merchant;
+
+import com.izouma.dingdong.domain.merchant.Goods;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface GoodsRepo extends JpaRepository<Goods, Long>, JpaSpecificationExecutor<Goods> {
+}

src/main/java/com/izouma/dingdong/repo/merchant/MerchantRepo.java

@@ -0,0 +1,18 @@
+package com.izouma.dingdong.repo.merchant;
+
+import com.izouma.dingdong.domain.merchant.Merchant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface MerchantRepo extends JpaRepository<Merchant, Long>, JpaSpecificationExecutor<Merchant> {
+    @Query("update Merchant t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+
+}

src/main/java/com/izouma/dingdong/repo/merchant/SalesRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.dingdong.repo.merchant;
+
+import com.izouma.dingdong.domain.merchant.Sales;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface SalesRepo extends JpaRepository<Sales, Long>, JpaSpecificationExecutor<Sales> {
+}

src/main/java/com/izouma/dingdong/service/backstage/CategoryService.java

@@ -0,0 +1,66 @@
+package com.izouma.dingdong.service.backstage;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.dto.CategoryDTO;
+import com.izouma.dingdong.repo.backstage.CategoryRepo;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class CategoryService {
+
+    private CategoryRepo categoryRepo;
+
+    /*
+    转DTO
+     */
+    private CategoryDTO categoryDTO(Category category){
+        CategoryDTO dto = new CategoryDTO();
+        BeanUtil.copyProperties(category, dto);
+        if (CollUtil.isNotEmpty(category.getChildren())){
+            dto.setChildren(category.getChildren().stream().map(this::categoryDTO).collect(Collectors.toList()));
+        }
+        return dto;
+    }
+
+    /*
+    树形显示菜单
+     */
+    public List<CategoryDTO> treeList(Long id) {
+        List<Category> categories = categoryRepo.findAllByParent(id);
+
+//        List<CategoryDTO> categoryDTOS = CollUtil.newArrayList();
+//        List<CategoryDTO> children = CollUtil.newArrayList();
+/*        categories.forEach(c -> {
+                    CategoryDTO categoryDTO = new CategoryDTO();
+                    BeanUtil.copyProperties(c, categoryDTO);
+                    if (CollUtil.isNotEmpty(c.getChildren())) {
+                        c.getChildren().forEach(category -> {
+                            CategoryDTO dto = new CategoryDTO();
+                            BeanUtil.copyProperties(category, dto);
+                            children.add(dto);
+                        });
+                        categoryDTO.setChildren(children);
+                    }
+                    categoryDTOS.add(categoryDTO);
+                }
+        );*/
+
+
+        return categories.stream().map(this::categoryDTO).collect(Collectors.toList());
+    }
+
+
+}

src/main/java/com/izouma/dingdong/service/backstage/TagService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.backstage;
+
+import com.izouma.dingdong.domain.backstage.Tag;
+import com.izouma.dingdong.repo.backstage.TagRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class TagService {
+
+    private TagRepo tagRepo;
+
+}

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

@@ -0,0 +1,22 @@
+package com.izouma.dingdong.service.merchant;
+
+import com.izouma.dingdong.domain.merchant.Goods;
+import com.izouma.dingdong.repo.merchant.GoodsRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+public class GoodsService {
+
+    private GoodsRepo goodsRepo;
+
+     /*
+    推荐商品
+     */
+     public List<Goods> recommend(){
+      return null;
+     }
+}

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

@@ -0,0 +1,17 @@
+package com.izouma.dingdong.service.merchant;
+
+import com.izouma.dingdong.domain.merchant.Merchant;
+import com.izouma.dingdong.repo.merchant.MerchantRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MerchantService {
+
+    private MerchantRepo merchantRepo;
+
+
+
+
+}

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

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.merchant;
+
+import com.izouma.dingdong.domain.merchant.Sales;
+import com.izouma.dingdong.repo.merchant.SalesRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class SalesService {
+
+    private SalesRepo salesRepo;
+
+}

src/main/java/com/izouma/dingdong/web/AuthorityController.java

@@ -6,6 +6,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.PostConstruct;
 import java.util.List;
 
 @RestController
@@ -25,4 +26,11 @@ public class AuthorityController extends BaseController {
     public Authority save(Authority authority) {
         return authorityRepo.save(authority);
     }
+
+    @PostConstruct
+    public void init() {
+        authorityRepo.save(new Authority(Authority.NAMES.ROLE_ADMIN.name()));
+        authorityRepo.save(new Authority(Authority.NAMES.ROLE_USER.name()));
+        authorityRepo.save(new Authority(Authority.NAMES.ROLE_DEV.name()));
+    }
 }

src/main/java/com/izouma/dingdong/web/backstage/CategoryController.java

@@ -0,0 +1,80 @@
+package com.izouma.dingdong.web.backstage;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.izouma.dingdong.dto.CategoryDTO;
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Category;
+import com.izouma.dingdong.service.backstage.CategoryService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.CategoryRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/category")
+@AllArgsConstructor
+public class CategoryController extends BaseController {
+    private CategoryService categoryService;
+    private CategoryRepo categoryRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Category save(Category record) {
+        if (record.getId() != null) {
+            Category orig = categoryRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return categoryRepo.save(orig);
+        }
+        return categoryRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Category> all(PageQuery pageQuery) {
+        return categoryRepo.findAll(toSpecification(pageQuery,Category.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Category get(@PathVariable Long id) {
+        return categoryRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        categoryRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Category> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/saveCategory")
+    public CategoryDTO saveCategory(CategoryDTO dto){
+        return null;
+    }
+
+    @GetMapping("/tree")
+    public List<Category> tree(Long id){
+        List<Category> categories = categoryRepo.findAllByParent(id);
+        return categories;
+    }
+
+}
+

src/main/java/com/izouma/dingdong/web/backstage/TagController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.backstage;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Tag;
+import com.izouma.dingdong.service.backstage.TagService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.TagRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/tag")
+@AllArgsConstructor
+public class TagController extends BaseController {
+    private TagService tagService;
+    private TagRepo tagRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Tag save(@RequestBody Tag record) {
+        if (record.getId() != null) {
+            Tag orig = tagRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return tagRepo.save(orig);
+        }
+        return tagRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Tag> all(PageQuery pageQuery) {
+        return tagRepo.findAll(toSpecification(pageQuery,Tag.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Tag get(@PathVariable Long id) {
+        return tagRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        tagRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Tag> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/merchant/GoodsController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.merchant;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.merchant.Goods;
+import com.izouma.dingdong.service.merchant.GoodsService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.merchant.GoodsRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/goods")
+@AllArgsConstructor
+public class GoodsController extends BaseController {
+    private GoodsService goodsService;
+    private GoodsRepo goodsRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Goods save(@RequestBody Goods record) {
+        if (record.getId() != null) {
+            Goods orig = goodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return goodsRepo.save(orig);
+        }
+        return goodsRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Goods> all(PageQuery pageQuery) {
+        return goodsRepo.findAll(toSpecification(pageQuery,Goods.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Goods get(@PathVariable Long id) {
+        return goodsRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        goodsRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Goods> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/merchant/MerchantController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.merchant;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.merchant.Merchant;
+import com.izouma.dingdong.service.merchant.MerchantService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.merchant.MerchantRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/merchant")
+@AllArgsConstructor
+public class MerchantController extends BaseController {
+    private MerchantService merchantService;
+    private MerchantRepo merchantRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Merchant save(@RequestBody Merchant record) {
+        if (record.getId() != null) {
+            Merchant orig = merchantRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return merchantRepo.save(orig);
+        }
+        return merchantRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Merchant> all(PageQuery pageQuery) {
+        return merchantRepo.findAll(toSpecification(pageQuery,Merchant.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Merchant get(@PathVariable Long id) {
+        return merchantRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        merchantRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Merchant> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/merchant/SalesController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.merchant;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.merchant.Sales;
+import com.izouma.dingdong.service.merchant.SalesService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.merchant.SalesRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/sales")
+@AllArgsConstructor
+public class SalesController extends BaseController {
+    private SalesService salesService;
+    private SalesRepo salesRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Sales save(@RequestBody Sales record) {
+        if (record.getId() != null) {
+            Sales orig = salesRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return salesRepo.save(orig);
+        }
+        return salesRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Sales> all(PageQuery pageQuery) {
+        return salesRepo.findAll(toSpecification(pageQuery,Sales.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Sales get(@PathVariable Long id) {
+        return salesRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        salesRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Sales> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/vue/src/router.js

@@ -62,8 +62,96 @@ const router = new Router({
                     path: '/sysConfigList',
                     name: 'sysConfigList',
                     component: () => import(/* webpackChunkName: "sysConfigList" */ '@/views/SysConfigList.vue'),
-                }
+                },
+                {
+                    path: '/merchantEdit',
+                    name: 'MerchantEdit',
+                    component: () => import(/* webpackChunkName: "merchantEdit" */ '@/views/MerchantEdit.vue'),
+                    meta: {
+                       title: '商户编辑',
+                    },
+                },
+                {
+                    path: '/merchantList',
+                    name: 'MerchantList',
+                    component: () => import(/* webpackChunkName: "merchantList" */ '@/views/MerchantList.vue'),
+                    meta: {
+                       title: '商户',
+                    },
+               },
+                {
+                    path: '/goodsEdit',
+                    name: 'GoodsEdit',
+                    component: () => import(/* webpackChunkName: "goodsEdit" */ '@/views/GoodsEdit.vue'),
+                    meta: {
+                       title: '商品编辑',
+                    },
+                },
+                {
+                    path: '/goodsList',
+                    name: 'GoodsList',
+                    component: () => import(/* webpackChunkName: "goodsList" */ '@/views/GoodsList.vue'),
+                    meta: {
+                       title: '商品',
+                    },
+               },
+                {
+                    path: '/salesEdit',
+                    name: 'SalesEdit',
+                    component: () => import(/* webpackChunkName: "salesEdit" */ '@/views/SalesEdit.vue'),
+                    meta: {
+                       title: '商品每日销售编辑',
+                    },
+                },
+                {
+                    path: '/salesList',
+                    name: 'SalesList',
+                    component: () => import(/* webpackChunkName: "salesList" */ '@/views/SalesList.vue'),
+                    meta: {
+                       title: '商品每日销售',
+                    },
+               },
+                {
+                    path: '/categoryEdit',
+                    name: 'CategoryEdit',
+                    component: () => import(/* webpackChunkName: "categoryEdit" */ '@/views/CategoryEdit.vue'),
+                    meta: {
+                       title: '类别编辑',
+                    },
+                },
+                {
+                    path: '/categoryList',
+                    name: 'CategoryList',
+                    component: () => import(/* webpackChunkName: "categoryList" */ '@/views/CategoryList.vue'),
+                    meta: {
+                       title: '类别',
+                    },
+               },
+                {
+                    path: '/cateEdit',
+                    name: 'cateEdit',
+                    component: () => import(/* webpackChunkName: "cateEdit" */ '@/views/TagEdit.vue'),
+                    meta: {
+                       title: '标签编辑',
+                    },
+                },
+                {
+                    path: '/tagList',
+                    name: 'TagList',
+                    component: () => import(/* webpackChunkName: "tagList" */ '@/views/TagList.vue'),
+                    meta: {
+                       title: '标签',
+                    },
+               }
                 /**INSERT_LOCATION**/,
+                {
+                    path: '/categories',
+                    name: 'Categories',
+                    component: () => import(/* webpackChunkName: "tagList" */ '@/views/Categories.vue'),
+                    meta: {
+                        title: '分类',
+                    },
+                }
             ],
         },
         {

src/main/vue/src/views/Categories.vue

@@ -0,0 +1,376 @@
+<template>
+    <div class="edit-view">
+        <el-button type="text" @click="addRootMenu" style="margin-left: 24px">添加
+        </el-button>
+        <el-tree :data="menus" :render-content="renderContent"
+                 :highlight-current="true" :expand-on-click-node="true" node-key="id"
+                 default-expand-all v-loading="loading" class="my-tree">
+        </el-tree>
+        <el-dialog :visible.sync="dialogVisible" title="添加分类">
+            <el-form :model="menu" ref="form" label-position="top">
+                <el-form-item label="分类名" prop="name"
+                              :rules="[{required: true, message: '请填写分类名', trigger: 'blur'}]">
+                    <el-input v-model="menu.name"></el-input>
+                </el-form-item>
+<!--                <el-form-item label="菜单地址" prop="path">-->
+<!--                    <el-input v-model="menu.path"></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item prop="icon">-->
+<!--                    <template slot="label">图标-->
+<!--                        <a href="https://fontawesome.com/icons?d=gallery&s=brands,solid&m=free"-->
+<!--                           target="_blank"-->
+<!--                           class="available-icons">查看所有可用图标</a></template>-->
+<!--                    <el-input v-model="icon">-->
+<!--                        <template slot="append"><span ref="iconContainer"-->
+<!--                                                      style="font-size: 18px"><i-->
+<!--                                class="fas fa-"></i></span></template>-->
+<!--                    </el-input>-->
+<!--                </el-form-item>-->
+            </el-form>
+            <div slot="footer">
+                <el-button @click="dialogVisible = false">取消
+                </el-button>
+                <el-button type="primary" @click="addMenu" :loading="loading">保存
+                </el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    export default {
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                dialogVisible: false,
+                curr: null,
+                loading: false,
+                menus: [],
+                menu: {
+                    name: "",
+                    // path: "",
+                    // icon: "",
+                    // root: false,
+                    // active: true
+                },
+                parent: null,
+                currentRef: null,
+                edit: false,
+                // icon: ""
+            };
+        },
+        methods: {
+            addRootMenu() {
+                this.menu = {
+                    name: "",
+                    // path: "",
+                    // active: true,
+                    // root: true,
+                    // icon: "bars"
+                };
+                this.parent = 1;
+                // this.icon = "bars";
+                this.dialogVisible = true;
+                // setTimeout(() => {
+                //     this.showIcon("bars");
+                // }, 100);
+            },
+            showAddDialog(node, data) {
+                this.edit = false;
+                this.parent = node.data;
+                this.menu = {
+                    parent: node.data.id,
+                    name: "",
+                    // path: "",
+                    // active: true,
+                    // root: false,
+                    // icon: null
+                };
+                // this.icon = "";
+                this.dialogVisible = true;
+                // setTimeout(() => {
+                //     this.showIcon("");
+                // }, 100);
+            },
+            showEditDialog(node, data) {
+                this.edit = true;
+                this.currentRef = node.data;
+                // const getIconName = icon => {
+                //     let iconName = "";
+                //     if (icon) {
+                //         iconName = icon
+                //             .replace("fas ", "")
+                //             .replace("fab ", "")
+                //             .replace("fa-", "");
+                //     }
+                //     return iconName || null;
+                // };
+                // let iconName = getIconName(data.icon);
+                this.menu = {
+                    ...data
+                };
+                // this.icon = iconName;
+                this.dialogVisible = true;
+                // setTimeout(() => {
+                //     this.showIcon(iconName);
+                // }, 100);
+            },
+            addMenu() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.loading = true;
+                        let menu = { ...this.menu };
+                        delete menu.children;
+                        this.$http
+                            .post("/category/save", menu)
+                            .then(res => {
+                                this.loading = false;
+                                this.$message.success("添加成功");
+                                this.dialogVisible = false;
+                                if (this.edit) {
+                                    for (let [key, value] of Object.entries(res)) {
+                                        console.log(`${key}: ${value}`);
+                                        this.$set(this.currentRef, key, value);
+                                    }
+                                } else if (this.parent) {
+                                    this.parent.children =
+                                        this.parent.children || [];
+                                    this.parent.children.push(res);
+                                } else {
+                                    this.menus.push(res);
+                                }
+                            })
+                            .catch(e => {
+                                console.log(e);
+                                this.loading = false;
+                                this.$message.error(e.error);
+                            });
+                    }
+                });
+            },
+            remove(node, data) {
+                console.log(node);
+                this.$confirm("确定删除菜单？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "error"
+                })
+                    .then(() => {
+                        this.$http
+                            .post("/category/save", {
+                                ...data,
+                                active: false,
+                                children: null
+                            })
+                            .then(res => {
+                                this.$message.success("删除成功");
+                                let index = node.parent.data.children.findIndex(
+                                    i => {
+                                        return i.id === data.id;
+                                    }
+                                );
+                                if (index > -1) {
+                                    node.parent.data.children.splice(index, 1);
+                                }
+                            })
+                            .catch(e => {
+                                console.log(e);
+                                this.loading = false;
+                                this.$message.error(e.error);
+                            });
+                    })
+                    .catch(() => {});
+            },
+/*            moveUp(node, data) {
+                if (node.previousSibling) {
+                    this.loading = true;
+                    let sort0 = node.previousSibling.data.sort,
+                        sort1 = node.data.sort;
+                    Promise.all([
+                        this.$http.post("/category/save", {
+                            ...node.data,
+                            children: null,
+                            sort: sort0
+                        }),
+                        this.$http.post("/category/save", {
+                            ...node.previousSibling.data,
+                            children: null,
+                            sort: sort1
+                        })
+                    ])
+                        .then(_ => {
+                            this.loading = false;
+                            let tmp = { ...node.previousSibling.data, sort: sort1 };
+                            node.previousSibling.data = {
+                                ...node.data,
+                                sort: sort0
+                            };
+                            node.data = tmp;
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.loading = false;
+                            this.$message.error(e.error);
+                        });
+                }
+            },
+            moveDown(node, data) {
+                if (node.nextSibling) {
+                    this.loading = true;
+                    let sort0 = node.data.sort,
+                        sort1 = node.nextSibling.data.sort;
+                    Promise.all([
+                        this.$http.post("/category/save", {
+                            ...node.data,
+                            children: null,
+                            sort: sort1
+                        }),
+                        this.$http.post("/category/save", {
+                            ...node.nextSibling.data,
+                            children: null,
+                            sort: sort0
+                        })
+                    ])
+                        .then(_ => {
+                            this.loading = false;
+                            let tmp = { ...node.nextSibling.data, sort: sort0 };
+                            node.nextSibling.data = { ...node.data, sort: sort1 };
+                            node.data = tmp;
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.loading = false;
+                            this.$message.error(e.error);
+                        });
+                }
+            },*/
+            getData() {
+                this.$http
+                    .get("/category/tree",{
+                        id : 1
+                    })
+                    .then(res => {
+                        this.menus = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            },
+            renderContent(h, { node, data, store }) {
+                return (
+                    <span class="custom-tree-node">
+                    <span>{data.name}</span>
+                    <span class="url">{data.path}</span>
+                    <span class="opt">
+
+                    <el-button
+                type="text"
+                on-click={e => {
+                    this.showEditDialog(node, data),
+                        e.stopPropagation();
+                }}
+                icon="el-icon-edit"
+                    >
+                    编辑
+                    </el-button>
+                    <el-button
+                type="text"
+                on-click={e => {
+                    this.showAddDialog(node, data),
+                        e.stopPropagation();
+                }}
+                icon="el-icon-plus"
+                    >
+                    添加
+                    </el-button>
+                    <el-button
+                type="text"
+                on-click={e => {
+                    this.remove(node, data), e.stopPropagation();
+                }}
+                icon="el-icon-delete"
+                    >
+                    删除
+                    </el-button>
+                    </span>
+                    </span>
+            );
+            },
+            // showIcon(val) {
+            //     if (!this.$refs.iconContainer) return;
+            //     if (FontAwesome.icon({ prefix: "fas", iconName: val })) {
+            //         this.$refs.iconContainer.innerHTML = "";
+            //         let i = document.createElement("i");
+            //         i.className = "fas fa-" + val;
+            //         this.$refs.iconContainer.append(i);
+            //         FontAwesome.dom.i2svg();
+            //         this.menu.icon = "fas fa-" + val;
+            //     } else if (FontAwesome.icon({ prefix: "fab", iconName: val })) {
+            //         this.$refs.iconContainer.innerHTML = "";
+            //         let i = document.createElement("i");
+            //         i.className = "fab fa-" + val;
+            //         this.$refs.iconContainer.append(i);
+            //         FontAwesome.dom.i2svg();
+            //         this.menu.icon = "fab fa-" + val;
+            //     } else {
+            //         this.$refs.iconContainer.innerHTML = "";
+            //         let i = document.createElement("i");
+            //         i.className = "fab fa-" + val;
+            //         this.$refs.iconContainer.append(i);
+            //         FontAwesome.dom.i2svg();
+            //         this.menu.icon = "";
+            //     }
+            // }
+        },
+        // watch: {
+        //     icon(val) {
+        //         this.showIcon(val);
+        //     }
+        // }
+    };
+</script>
+<style lang="less">
+    .custom-tree-node {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 14px;
+        padding-right: 8px;
+        .url {
+            flex-grow: 1;
+            text-align: right;
+            margin-right: 20px;
+            color: #999;
+        }
+        .opt {
+            opacity: 1;
+        }
+    }
+
+    .custom-tree-node:hover {
+        .opt {
+            opacity: 1;
+        }
+    }
+
+    .available-icons {
+        color: #409eff;
+        text-decoration: none;
+        &:hover {
+            color: #409eff;
+            text-decoration: none;
+        }
+    }
+
+    .my-tree {
+        border-top: 1px solid #f2f4f5;
+        .el-tree-node__content {
+            height: 42px;
+            border: 1px solid #f2f4f5;
+            border-top: none;
+        }
+    }
+</style>

src/main/vue/src/views/CategoryEdit.vue

@@ -0,0 +1,94 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="name" label="类别名称">
+                            <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+                <el-form-item prop="parent" label="父类">
+                            <el-input-number type="number" v-model="formData.parent"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="children" label="子类">
+                            <el-input v-model="formData.children"></el-input>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'CategoryEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('category/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/category/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/category/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/CategoryList.vue

@@ -0,0 +1,170 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="name" label="类别名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="parent" label="父类"
+>
+                    </el-table-column>
+                    <el-table-column prop="children" label="子类"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'CategoryList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/category/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/categoryEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/categoryEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/category/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/category/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/GoodsEdit.vue

@@ -0,0 +1,127 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="66px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="merchantId" label="商户ID">
+                            <el-input-number type="number" v-model="formData.merchantId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="name" label="名称">
+                            <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+                <el-form-item prop="introduction" label="简介">
+                            <el-input v-model="formData.introduction"></el-input>
+                </el-form-item>
+                <el-form-item prop="img" label="图片">
+                            <multi-upload v-model="formData.img"></multi-upload>
+                </el-form-item>
+                <el-form-item prop="inventory" label="库存">
+                            <el-input-number type="number" v-model="formData.inventory"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="totalSales" label="总销量">
+                            <el-input-number type="number" v-model="formData.totalSales"></el-input-number>
+                </el-form-item>
+<!--                <el-form-item prop="daySales" label="日销售">
+                            <el-input-number type="number" v-model="formData.daySales"></el-input-number>
+                </el-form-item>-->
+                <el-form-item prop="likes" label="点赞">
+                            <el-input-number type="number" v-model="formData.likes"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="amount" label="价格">
+                            <el-input-number type="number" v-model="formData.amount"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="discountAmount" label="折扣">
+                            <el-input-number type="number" v-model="formData.discountAmount"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="signboard" label="招牌">
+                            <el-switch v-model="formData.signboard"></el-switch>
+                </el-form-item>
+                <el-form-item prop="takeOff" label="下架">
+                            <el-switch v-model="formData.takeOff"></el-switch>
+                </el-form-item>
+                <el-form-item prop="sort" label="排布">
+                            <el-input-number type="number" v-model="formData.sort"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="isFullReduction" label="满减">
+                            <el-switch v-model="formData.isFullReduction"></el-switch>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'GoodsEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('goods/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/goods/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/goods/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/GoodsList.vue

@@ -0,0 +1,217 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="merchantId" label="商户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="name" label="名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="introduction" label="简介"
+>
+                    </el-table-column>
+                    <el-table-column prop="img" label="图片"
+>
+                            <template slot-scope="{row}">
+                                <el-image style="width: 30px; height: 30px"
+                                          :src="row.img[0]" fit="cover"
+                                          :preview-src-list="row.img"></el-image>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="inventory" label="库存"
+>
+                    </el-table-column>
+                    <el-table-column prop="totalSales" label="总销量"
+>
+<!--                    </el-table-column>
+                    <el-table-column prop="daySales" label="日销售"
+>-->
+                    </el-table-column>
+                    <el-table-column prop="likes" label="点赞"
+>
+                    </el-table-column>
+                    <el-table-column prop="amount" label="价格"
+>
+                    </el-table-column>
+                    <el-table-column prop="discountAmount" label="折扣"
+>
+                    </el-table-column>
+                    <el-table-column prop="signboard" label="招牌"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.signboard?'':'info'">{{row.signboard}}</el-tag>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="takeOff" label="下架"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.takeOff?'':'info'">{{row.takeOff}}</el-tag>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="sort" label="排布"
+>
+                    </el-table-column>
+                    <el-table-column prop="isFullReduction" label="满减"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.isFullReduction?'':'info'">{{row.isFullReduction}}</el-tag>
+                            </template>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'GoodsList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/goods/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/goodsEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/goodsEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/goods/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/goods/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/MerchantEdit.vue

@@ -0,0 +1,127 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="94px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="userId" label="用户ID">
+                            <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="name" label="名称">
+                            <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+                <el-form-item prop="introduction" label="简介">
+                            <el-input v-model="formData.introduction"></el-input>
+                </el-form-item>
+                <el-form-item prop="img" label="图片">
+                            <multi-upload v-model="formData.img"></multi-upload>
+                </el-form-item>
+                <el-form-item prop="address" label="地址">
+                            <el-input v-model="formData.address"></el-input>
+                </el-form-item>
+                <el-form-item prop="blacklist" label="黑名单">
+                            <el-switch v-model="formData.blacklist"></el-switch>
+                </el-form-item>
+                <el-form-item prop="firstOrder" label="首单优惠">
+                            <el-input-number type="number" v-model="formData.firstOrder"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="newUser" label="新用户优惠">
+                            <el-input-number type="number" v-model="formData.newUser"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="category" label="类别">
+                            <el-tree
+                                    :props="props"
+                                    :load="loadNode"
+                                    lazy
+                                    show-checkbox
+                                    @check-change="handleCheckChange">
+                            </el-tree>
+                </el-form-item>
+                <el-form-item prop="tag" label="标签">
+                            <el-tree
+                                    :props="props"
+                                    :load="loadNode"
+                                    lazy
+                                    show-checkbox
+                                    @check-change="handleCheckChange">
+                            </el-tree>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'MerchantEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('merchant/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/merchant/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/merchant/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/MerchantList.vue

@@ -0,0 +1,199 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="name" label="名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="introduction" label="简介"
+>
+                    </el-table-column>
+                    <el-table-column prop="img" label="图片"
+>
+                            <template slot-scope="{row}">
+                                <el-image style="width: 30px; height: 30px"
+                                          :src="row.img[0]" fit="cover"
+                                          :preview-src-list="row.img"></el-image>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="address" label="地址"
+>
+                    </el-table-column>
+                    <el-table-column prop="blacklist" label="黑名单"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.blacklist?'':'info'">{{row.blacklist}}</el-tag>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="firstOrder" label="首单优惠"
+>
+                    </el-table-column>
+                    <el-table-column prop="newUser" label="新用户优惠"
+>
+                    </el-table-column>
+                    <el-table-column prop="category" label="类别"
+>
+                    </el-table-column>
+                    <el-table-column prop="tag" label="标签"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'MerchantList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/merchant/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/merchantEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/merchantEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/merchant/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/merchant/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/SalesEdit.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="goodsId" label="商品ID">
+                            <el-input-number type="number" v-model="formData.goodsId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="daySales" label="销售数量">
+                            <el-input-number type="number" v-model="formData.daySales"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="day" label="日期">
+                            <el-date-picker
+                                    v-model="formData.day"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="选择日期">
+                            </el-date-picker>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'SalesEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('sales/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/sales/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/sales/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/SalesList.vue

@@ -0,0 +1,171 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="goodsId" label="商品ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="daySales" label="销售数量"
+>
+                    </el-table-column>
+                    <el-table-column prop="day" label="日期"
+                            :formatter="dateFormatter"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'SalesList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/sales/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/salesEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/salesEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/sales/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/sales/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/TagEdit.vue

@@ -0,0 +1,88 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="name" label="标签名称">
+                            <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'TagEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('tag/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/tag/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/tag/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/TagList.vue

@@ -0,0 +1,164 @@
+<template>
+    <div  class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="name" label="标签名称"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'TagList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/tag/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/tagEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/tagEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/tag/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/tag/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/test/java/com/izouma/dingdong/repo/UserRepoTest.java

@@ -9,6 +9,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
@@ -20,10 +22,12 @@ public class UserRepoTest {
     @Test
     public void testUser() {
         User user = User.builder()
-                .username("testuser")
+                .username("root")
                 .password("123")
                 .avatar("")
+                .authorities(Collections.singleton(Authority.builder().name(Authority.NAMES.ROLE_ADMIN.name()).build()))
                 .enabled(true)
+                .blacklist(false)
                 .build();
         userRepo.save(user);
     }