环境

.gitignore

@@ -31,3 +31,6 @@ build/
 .vscode/
 
 .DS_Store
+
+### node ###
+node_modules

pom.xml

@@ -9,10 +9,10 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.izouma</groupId>
-    <artifactId>awesomeAdmin</artifactId>
+    <artifactId>dingdong</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>awesome-admin</name>
-    <description>awesome-admin</description>
+    <name>dingdong</name>
+    <description>dingdong</description>
 
     <repositories>
         <repository>

src/main/java/com/izouma/awesomeAdmin/Application.java → src/main/java/com/izouma/dingdong/Application.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin;
+package com.izouma.dingdong;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/izouma/awesomeAdmin/annotations/Searchable.java → src/main/java/com/izouma/dingdong/annotations/Searchable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.annotations;
+package com.izouma.dingdong.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/izouma/awesomeAdmin/config/Constants.java → src/main/java/com/izouma/dingdong/config/Constants.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 public interface Constants {
 

src/main/java/com/izouma/awesomeAdmin/config/DateConfig.java → src/main/java/com/izouma/dingdong/config/DateConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

src/main/java/com/izouma/awesomeAdmin/config/ErrorPageConfig.java → src/main/java/com/izouma/dingdong/config/ErrorPageConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;

src/main/java/com/izouma/awesomeAdmin/config/LocalDateTimeSerializerConfig.java → src/main/java/com/izouma/dingdong/config/LocalDateTimeSerializerConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;

src/main/java/com/izouma/awesomeAdmin/config/RedisConfig.java → src/main/java/com/izouma/dingdong/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

src/main/java/com/izouma/awesomeAdmin/config/SpringSecurityAuditorAware.java → src/main/java/com/izouma/dingdong/config/SpringSecurityAuditorAware.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.utils.SecurityUtils;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;
 

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

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/izouma/awesomeAdmin/config/WxMaConfiguration.java → src/main/java/com/izouma/dingdong/config/WxMaConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

src/main/java/com/izouma/awesomeAdmin/config/WxMaProperties.java → src/main/java/com/izouma/dingdong/config/WxMaProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/config/WxMpConfiguration.java → src/main/java/com/izouma/dingdong/config/WxMpConfiguration.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
-import com.izouma.awesomeAdmin.mpHandler.LogHandler;
+import com.izouma.dingdong.mpHandler.LogHandler;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;

src/main/java/com/izouma/awesomeAdmin/config/WxMpProperties.java → src/main/java/com/izouma/dingdong/config/WxMpProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/config/WxPayConfiguration.java → src/main/java/com/izouma/dingdong/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

src/main/java/com/izouma/awesomeAdmin/config/WxPayProperties.java → src/main/java/com/izouma/dingdong/config/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.dingdong.config;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

src/main/java/com/izouma/awesomeAdmin/converter/LongArrayConverter.java → src/main/java/com/izouma/dingdong/converter/LongArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.dingdong.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/izouma/awesomeAdmin/converter/StringArrayConverter.java → src/main/java/com/izouma/dingdong/converter/StringArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.dingdong.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/izouma/awesomeAdmin/converter/StringToMapConverter.java → src/main/java/com/izouma/dingdong/converter/StringToMapConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.dingdong.converter;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -0,0 +1,31 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "评价表", description = "评价表")
+public class Appraisal extends BaseEntity {
+    @ApiModelProperty(value = "订单号", name = "orderId")
+    private Long orderId;
+
+    @ApiModelProperty(value = "商户ID", name = "merchantId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "商家评价", name = "merchantAppraise")
+    private String merchantAppraise;
+
+    @ApiModelProperty(value = "骑手评价", name = "riderAppraise")
+    private String riderAppraise;
+}

src/main/java/com/izouma/awesomeAdmin/domain/AuditedEntity.java → src/main/java/com/izouma/dingdong/domain/AuditedEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java → src/main/java/com/izouma/dingdong/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/izouma/awesomeAdmin/domain/Menu.java → src/main/java/com/izouma/dingdong/domain/Menu.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import lombok.Data;
 import org.hibernate.annotations.Where;

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

@@ -0,0 +1,61 @@
+package com.izouma.dingdong.domain;
+
+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 javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "订单表", description = "订单表")
+public class Order extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "配送地址", name = "userAddress")
+    private String userAddress;
+
+    @ApiModelProperty(value = "商户ID", name = "merchantId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "商品ID",name = "goodsId")
+    private Long goodsId;
+
+    @ApiModelProperty(value = "商家地址", name = "merchantAddress")
+    private String merchantAddress;
+
+    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
+    private String jobNumber;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "骑手状态", name = "riderStatus")
+    private RiderStatus riderStatus;
+
+    @ApiModelProperty(value = "总价", name = "totalAmount")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty(value = "配送费", name = "deliveryAmount")
+    private BigDecimal deliveryAmount;
+
+    @ApiModelProperty(value = "实付金额", name = "realAmount")
+    private BigDecimal realAmount;
+
+    @ApiModelProperty(value = "支付方式", name = "payMethod")
+    private PayMethod payMethod;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "取消订单", name = "cancel")
+    private Boolean cancel;
+}

src/main/java/com/izouma/awesomeAdmin/domain/SmsRecord.java → src/main/java/com/izouma/dingdong/domain/SmsRecord.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/izouma/awesomeAdmin/domain/SuperUser.java → src/main/java/com/izouma/dingdong/domain/SuperUser.java

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.dingdong.annotations.Searchable;
+import com.izouma.dingdong.config.Constants;
+import com.izouma.dingdong.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -19,7 +19,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 @Data
-@Entity
+//@Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Where(clause = "enabled = 1")

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

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

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

@@ -1,11 +1,12 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.dingdong.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.dingdong.annotations.Searchable;
+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;
@@ -17,9 +18,7 @@ import javax.persistence.*;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 @Data
@@ -74,5 +73,13 @@ public class User extends BaseEntity implements Serializable {
 
     private String email;
 
+/*    @ApiModelProperty(value = "身份", name = "identity")
+    private String identity;*/
 
+    @ApiModelProperty(value = "合作申请",name = "apply")
+    private String apply;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "黑名单", name = "blacklist")
+    private Boolean blacklist;
 }

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

@@ -0,0 +1,26 @@
+package com.izouma.dingdong.domain.backstage;
+
+import com.izouma.dingdong.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Banner extends BaseEntity {
+    @ApiModelProperty(value = "图片", name = "pic")
+    private String pic;
+
+    @ApiModelProperty(value = "描述", name = "remark")
+    private String remark;
+
+    @ApiModelProperty(value = "地址", name = "url")
+    private String url;
+}

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

@@ -0,0 +1,29 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "黑名单表", description = "黑名单")
+public class BlackList extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "身份", name = "identity")
+    private String identity;
+
+    @ApiModelProperty(value = "缘由", name = "reason")
+    private String reason;
+
+    @ApiModelProperty(value = "移除", name = "remove")
+    private Boolean remove;
+}

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

@@ -0,0 +1,33 @@
+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 javax.persistence.ConstraintMode;
+import javax.persistence.ForeignKey;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "商户类别", description = "商户类别")
+public class Category extends BaseEntity {
+    @ApiModelProperty(value = "类别名称", name = "name")
+    private String name;
+
+    private Long parent;
+
+    @OneToMany
+    @JoinColumn(name = "parent", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @ApiModelProperty(value = "子分类",name = "children")
+    private List<Category> children;
+}

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

@@ -0,0 +1,34 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+@ApiModel(value = "投诉表", description = "投诉表")
+public class Complaint extends BaseEntity {
+    @ApiModelProperty(value = "订单ID", name = "orderId")
+    private Long orderId;
+
+    @ApiModelProperty(value = "投诉目标", name = "target")
+    private String target;
+
+    @ApiModelProperty(value = "图片", name = "img")
+    private String img;
+
+    @ApiModelProperty(value = "内容", name = "content")
+    private String content;
+
+    @ApiModelProperty(value = "是否解决",name = "resolve")
+    private Boolean resolve;
+
+}

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

@@ -0,0 +1,29 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "系统邮件", description = "系统邮件")
+public class Email extends BaseEntity {
+    @ApiModelProperty(value = "发件人",name = "sendUserId")
+    private Long sendUserId;
+
+    @ApiModelProperty(value = "收件人",name = "receiveUserId")
+    private Long receiveUserId;
+
+    @ApiModelProperty(value = "标题", name = "title")
+    private String title;
+
+    @ApiModelProperty(value = "内容", name = "content")
+    private String content;
+}

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

@@ -0,0 +1,48 @@
+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 javax.persistence.Column;
+import java.math.BigDecimal;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "退款申请", description = "退款申请")
+public class RefundApply extends BaseEntity {
+    @ApiModelProperty(value = "订单ID", name = "orderId")
+    private Long orderId;
+
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "退款金额", name = "amount")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "客户缘由", name = "userReason")
+    private String userReason;
+
+    @ApiModelProperty(value = "商家缘由", name = "merchantReason")
+    private String merchantReason;
+
+    @ApiModelProperty(value = "商家是否同意", name = "isAgree")
+    private Boolean isAgree;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "取消退款", name = "cancel")
+    private Boolean cancel;
+
+    @ApiModelProperty(value = "退款是否成功",name = "isPass")
+    private Boolean isPass;
+}

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

@@ -0,0 +1,29 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "骑手申请", description = "骑手申请")
+public class RiderApply extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "区域",name = "area")
+    private String area;
+
+/*    @ApiModelProperty(value = "性别")
+    private String sex;*/
+
+    @ApiModelProperty(value = "是否通过", name = "isPass")
+    private Boolean isPass;
+}

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

@@ -0,0 +1,20 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "商户标签", description = "商户标签")
+public class Tag extends BaseEntity {
+    @ApiModelProperty(value = "标签名称", name = "name")
+    private String name;
+}

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

@@ -0,0 +1,42 @@
+package com.izouma.dingdong.domain.backstage;
+
+import com.izouma.dingdong.annotations.Searchable;
+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.Column;
+import java.math.BigDecimal;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "提现申请", description = "提现申请")
+public class WithdrawApply extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "工号", name = "jobNumber")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "金额",name = "amount")
+    private BigDecimal amount;
+
+    @Searchable
+    @ApiModelProperty(value = "账号", name = "account")
+    private String account;
+
+    @Searchable
+    @ApiModelProperty(value = "真实姓名", name = "realName")
+    private String realName;
+
+    @ApiModelProperty(value = "是否成功", name = "consent")
+    @Column(nullable = false)
+    private Boolean consent;
+}

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

@@ -0,0 +1,54 @@
+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 java.math.BigDecimal;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+@ApiModel(value = "Goods", description = "商品")
+public class Goods extends BaseEntity {
+
+    @ApiModelProperty(value = "商户ID", name = "merchantId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "商品名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "简介", name = "introduction")
+    private String introduction;
+
+    @ApiModelProperty(value = "图片", name = "img")
+    private String img;
+
+    @ApiModelProperty(value = "库存", name = "inventory")
+    private int inventory;
+
+    @ApiModelProperty(value = "销量", name = "sales")
+    private int sales;
+
+    @ApiModelProperty(value = "点赞数量", name = "likes")
+    private int likes;
+
+    @ApiModelProperty(value = "价格", name = "amount")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "折扣价格", name = "discountAmount")
+    private BigDecimal discountAmount;
+
+    @ApiModelProperty(value = "招牌", name = "signboard")
+    private Boolean signboard;
+
+    @ApiModelProperty(value = "下架", name = "takeOff")
+    private Boolean takeOff;
+}

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

@@ -0,0 +1,51 @@
+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 javax.persistence.Column;
+import java.util.Set;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+@ApiModel(value = "商户", description = "商户")
+public class Merchant extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "商户名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "简介", name = "introduction")
+    private String introduction;
+
+    @ApiModelProperty(value = "图片", name = "img")
+    private String img;
+
+    @ApiModelProperty(value = "类别", name = "category")
+    private Set<Category> category;
+
+    @ApiModelProperty(value = "标签", name = "tag")
+    private Set<Tag> tag;
+
+    @ApiModelProperty(value = "优惠", name = "discount")
+    private String discount;
+
+    @ApiModelProperty(value = "商户地址", name = "address")
+    private String address;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "黑名单", name = "blacklist")
+    private Boolean blacklist;
+}

src/main/java/com/izouma/dingdong/domain/rider/MonetaryRecord.java

@@ -0,0 +1,35 @@
+package com.izouma.dingdong.domain.rider;
+
+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 java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "货币流水", description = "货币流水")
+public class MonetaryRecord extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "工号", name = "jobNumber")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "交易时间", name = "settleTime")
+    private LocalDateTime settleTime;
+
+    @ApiModelProperty(value = "交易类型", name = "transactionType")
+    private String transactionType;
+
+    @ApiModelProperty(value = "金额", name = "amount")
+    private BigDecimal amount;
+}

src/main/java/com/izouma/dingdong/domain/rider/Rider.java

@@ -0,0 +1,61 @@
+package com.izouma.dingdong.domain.rider;
+
+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.Column;
+import java.math.BigDecimal;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "骑手", description = "骑手")
+public class Rider extends BaseEntity {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "工号", name = "jobNumber")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "区域",name = "area")
+    private String area;
+
+    @ApiModelProperty(value = "签到", name = "signIn")
+    private Boolean signIn;
+
+    @ApiModelProperty(value = "经验值", name = "experience")
+    private String experience;
+
+    @ApiModelProperty(value = "等级", name = "level")
+    private int level;
+
+    @ApiModelProperty(value = "货币", name = "monetary")
+    private BigDecimal monetary;
+
+    @ApiModelProperty(value = "成单数", name = "singular")
+    private int singular;
+
+    @ApiModelProperty(value = "距离", name = "distance")
+    private double distance;
+
+    @ApiModelProperty(value = "好评数", name = "goodReview")
+    private int goodReview;
+
+    @ApiModelProperty(value = "差评数", name = "badReview")
+    private int badReview;
+
+    @ApiModelProperty(value = "操作",name = "operate")
+    private String operate;
+
+    @Column(nullable = false)
+    @ApiModelProperty(value = "黑名单", name = "blacklist")
+    private Boolean blacklist;
+
+}

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

@@ -0,0 +1,33 @@
+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;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+//@Entity
+@Builder
+//@JsonIgnoreProperties(value = {"hibernateLazyInitializer"})
+@ApiModel(value = "Address", description = "收获地址记录")
+public class Address extends BaseEntity {
+    @ApiModelProperty("用户Id")
+    private Long userId;
+
+    @ApiModelProperty("收件人姓名")
+    private String name;
+
+    @ApiModelProperty("收件人电话")
+    private String phone;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("是否选为默认地址")
+    private Boolean enabled ;
+}

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

@@ -0,0 +1,53 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@JsonIgnoreProperties(value = { "hibernateLazyInitializer"})
+//@Where(clause = "enabled = 1")
+@ApiModel(value = "优惠券", description = "优惠券")
+public class Coupon extends BaseEntity implements Serializable {
+    @ApiModelProperty(value = "用户ID", name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "优惠券名称", name = "name")
+    private String name;
+
+    @ApiModelProperty(value = "金额", name = "amount")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "有效期", name = "ExpirationDate")
+    private LocalDateTime ExpirationDate;
+
+    @ApiModelProperty(value = "是否过期", name = "isExpired")
+    private Boolean isExpired;
+
+    @ApiModelProperty(value = "是否已使用", name = "isUsed")
+    private Boolean isUsed;
+
+    @ApiModelProperty(value = "使用规则", name = "rule")
+    private String rule;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+    @JsonIgnore
+    private User user;
+
+}

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

@@ -0,0 +1,27 @@
+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;
+
+@Data
+//@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+//@Where(clause = "enabled = 1")
+@ApiModel(value = "我的收藏", description = "我的收藏")
+public class MyCollection extends BaseEntity {
+    @ApiModelProperty(value = "用户ID",name = "userId")
+    private Long userId;
+
+    @ApiModelProperty(value = "商户ID",name = "merchantId")
+    private Long merchantId;
+
+    @ApiModelProperty(value = "商户简介",name = "merchantProfile")
+    private String merchantProfile;
+}

src/main/java/com/izouma/awesomeAdmin/dto/PageQuery.java → src/main/java/com/izouma/dingdong/dto/PageQuery.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.dingdong.dto;
 
 import lombok.Data;
 

src/main/java/com/izouma/awesomeAdmin/dto/gen/GenCode.java → src/main/java/com/izouma/dingdong/dto/gen/GenCode.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.dingdong.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

src/main/java/com/izouma/awesomeAdmin/dto/gen/Subtable.java → src/main/java/com/izouma/dingdong/dto/gen/Subtable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.dingdong.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

src/main/java/com/izouma/awesomeAdmin/dto/gen/TableField.java → src/main/java/com/izouma/dingdong/dto/gen/TableField.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.dingdong.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

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

@@ -0,0 +1,17 @@
+package com.izouma.dingdong.enums;
+
+public enum PayMethod {
+    ALIPAY("支付宝"),
+    CASH_DELIVERY("货到付款"),
+    CREDIT_CARD("信用卡");
+
+    private final String description;
+
+    PayMethod(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.dingdong.enums;
+
+public enum RiderStatus {
+    /*
+    接单
+     */
+    JIEDAN,
+    /*
+    取餐
+     */
+    QUCAN,
+    /*
+    送餐
+     */
+    SONGCAN,
+    /*
+    完成
+     */
+    WANCHENG;
+}

src/main/java/com/izouma/awesomeAdmin/exception/AuthenticationException.java → src/main/java/com/izouma/dingdong/exception/AuthenticationException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.dingdong.exception;
 
 public class AuthenticationException extends RuntimeException {
     public AuthenticationException(String message, Throwable cause) {

src/main/java/com/izouma/awesomeAdmin/exception/BusinessException.java → src/main/java/com/izouma/dingdong/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.dingdong.exception;
 
 import java.util.function.Supplier;
 

src/main/java/com/izouma/awesomeAdmin/exception/GlobalExceptionHandler.java → src/main/java/com/izouma/dingdong/exception/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.dingdong.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

src/main/java/com/izouma/awesomeAdmin/mpHandler/LogHandler.java → src/main/java/com/izouma/dingdong/mpHandler/LogHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.mpHandler;
+package com.izouma.dingdong.mpHandler;
 
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;

src/main/java/com/izouma/awesomeAdmin/repo/AuthorityRepo.java → src/main/java/com/izouma/dingdong/repo/AuthorityRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.dingdong.repo;
 
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.dingdong.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AuthorityRepo extends JpaRepository<Authority, String> {

src/main/java/com/izouma/awesomeAdmin/repo/MenuRepo.java → src/main/java/com/izouma/dingdong/repo/MenuRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.dingdong.repo;
 
-import com.izouma.awesomeAdmin.domain.Menu;
+import com.izouma.dingdong.domain.Menu;
 import org.hibernate.annotations.Where;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/izouma/awesomeAdmin/repo/SmsRecordRepo.java → src/main/java/com/izouma/dingdong/repo/SmsRecordRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.dingdong.repo;
 
-import com.izouma.awesomeAdmin.domain.SmsRecord;
+import com.izouma.dingdong.domain.SmsRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/izouma/awesomeAdmin/repo/SysConfigRepo.java → src/main/java/com/izouma/dingdong/repo/SysConfigRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.dingdong.repo;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
+import com.izouma.dingdong.domain.SysConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/awesomeAdmin/repo/UserRepo.java → src/main/java/com/izouma/dingdong/repo/UserRepo.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.dingdong.repo;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/awesomeAdmin/security/Authority.java → src/main/java/com/izouma/dingdong/security/Authority.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
@@ -20,7 +20,31 @@ import java.util.Objects;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Authority implements Serializable {
     public enum NAMES {
-        ROLE_USER, ROLE_DEV, ROLE_ADMIN
+        /*
+        普通用户
+         */
+        ROLE_USER,
+        ROLE_DEV,
+        /*
+        超级管理员
+         */
+        ROLE_ADMIN,
+        /*
+        行业管理员
+         */
+        ROLE_INDUSTRY,
+        /*
+        本地化
+         */
+        ROLE_LOCALIZATION,
+        /*
+        财务
+         */
+        ROLE_FINANCE,
+        /*
+        客服
+         */
+        ROLE_CUSTOMER
     }
 
     @Id

src/main/java/com/izouma/awesomeAdmin/security/JwtAuthenticationEntryPoint.java → src/main/java/com/izouma/dingdong/security/JwtAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

src/main/java/com/izouma/awesomeAdmin/security/JwtAuthorizationTokenFilter.java → src/main/java/com/izouma/dingdong/security/JwtAuthorizationTokenFilter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;

src/main/java/com/izouma/awesomeAdmin/security/JwtConfig.java → src/main/java/com/izouma/dingdong/security/JwtConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/security/JwtTokenUtil.java → src/main/java/com/izouma/dingdong/security/JwtTokenUtil.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.jsonwebtoken.Claims;
@@ -6,12 +6,6 @@ import io.jsonwebtoken.Clock;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.impl.DefaultClock;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 

src/main/java/com/izouma/awesomeAdmin/security/JwtUser.java → src/main/java/com/izouma/dingdong/security/JwtUser.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.dingdong.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

src/main/java/com/izouma/awesomeAdmin/security/JwtUserDetailsService.java → src/main/java/com/izouma/dingdong/security/JwtUserDetailsService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.repo.UserRepo;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.repo.UserRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/izouma/awesomeAdmin/security/JwtUserFactory.java → src/main/java/com/izouma/dingdong/security/JwtUserFactory.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.dingdong.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

src/main/java/com/izouma/awesomeAdmin/security/WebSecurityConfig.java → src/main/java/com/izouma/dingdong/security/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.dingdong.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/izouma/awesomeAdmin/service/GenCodeService.java → src/main/java/com/izouma/dingdong/service/GenCodeService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.dingdong.service;
 
-import com.izouma.awesomeAdmin.dto.gen.GenCode;
-import com.izouma.awesomeAdmin.dto.gen.TableField;
+import com.izouma.dingdong.dto.gen.GenCode;
+import com.izouma.dingdong.dto.gen.TableField;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;

src/main/java/com/izouma/awesomeAdmin/service/SysConfigService.java → src/main/java/com/izouma/dingdong/service/SysConfigService.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.dingdong.service;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SysConfigRepo;
+import com.izouma.dingdong.domain.SysConfig;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.SysConfigRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import springfox.documentation.annotations.Cacheable;

src/main/java/com/izouma/awesomeAdmin/service/UserService.java → src/main/java/com/izouma/dingdong/service/UserService.java

@@ -1,17 +1,17 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.dingdong.service;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.UserRepo;
-import com.izouma.awesomeAdmin.security.Authority;
-import com.izouma.awesomeAdmin.security.JwtTokenUtil;
-import com.izouma.awesomeAdmin.security.JwtUserFactory;
-import com.izouma.awesomeAdmin.service.sms.SmsService;
-import com.izouma.awesomeAdmin.service.storage.StorageService;
+import com.izouma.dingdong.config.Constants;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.UserRepo;
+import com.izouma.dingdong.security.Authority;
+import com.izouma.dingdong.security.JwtTokenUtil;
+import com.izouma.dingdong.security.JwtUserFactory;
+import com.izouma.dingdong.service.sms.SmsService;
+import com.izouma.dingdong.service.storage.StorageService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;

src/main/java/com/izouma/awesomeAdmin/service/sms/AliSmsService.java → src/main/java/com/izouma/dingdong/service/sms/AliSmsService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.sms;
+package com.izouma.dingdong.service.sms;
 
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;
@@ -7,10 +7,10 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.domain.SmsRecord;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SmsRecordRepo;
+import com.izouma.dingdong.config.Constants;
+import com.izouma.dingdong.domain.SmsRecord;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.SmsRecordRepo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/izouma/awesomeAdmin/service/sms/SmsService.java → src/main/java/com/izouma/dingdong/service/sms/SmsService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.sms;
+package com.izouma.dingdong.service.sms;
 
 import java.util.function.Supplier;
 

src/main/java/com/izouma/awesomeAdmin/service/storage/AliStorageService.java → src/main/java/com/izouma/dingdong/service/storage/AliStorageService.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.dingdong.service.storage;
 
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.ObjectMetadata;
-import com.izouma.awesomeAdmin.exception.BusinessException;
+import com.izouma.dingdong.exception.BusinessException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

src/main/java/com/izouma/awesomeAdmin/service/storage/LocalStorageService.java → src/main/java/com/izouma/dingdong/service/storage/LocalStorageService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.dingdong.service.storage;
 
-import com.izouma.awesomeAdmin.exception.BusinessException;
+import com.izouma.dingdong.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/izouma/awesomeAdmin/service/storage/StorageService.java → src/main/java/com/izouma/dingdong/service/storage/StorageService.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.service.storage;
+package com.izouma.dingdong.service.storage;
 
 import java.io.InputStream;
 

src/main/java/com/izouma/awesomeAdmin/utils/DateTimeUtils.java → src/main/java/com/izouma/dingdong/utils/DateTimeUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import java.time.Instant;
 import java.time.LocalDate;

src/main/java/com/izouma/awesomeAdmin/utils/FileUtils.java → src/main/java/com/izouma/dingdong/utils/FileUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/izouma/awesomeAdmin/utils/JsonUtils.java → src/main/java/com/izouma/dingdong/utils/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/izouma/awesomeAdmin/utils/NullAwareBeanUtilsBean.java → src/main/java/com/izouma/dingdong/utils/NullAwareBeanUtilsBean.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
 

src/main/java/com/izouma/awesomeAdmin/utils/ObjUtils.java → src/main/java/com/izouma/dingdong/utils/ObjUtils.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 
 import org.apache.commons.beanutils.BeanUtilsBean;

src/main/java/com/izouma/awesomeAdmin/utils/PinYinUtil.java → src/main/java/com/izouma/dingdong/utils/PinYinUtil.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;

src/main/java/com/izouma/awesomeAdmin/utils/SecurityUtils.java → src/main/java/com/izouma/dingdong/utils/SecurityUtils.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.security.JwtUser;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.security.JwtUser;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 

src/main/java/com/izouma/awesomeAdmin/utils/SnowflakeIdWorker.java → src/main/java/com/izouma/dingdong/utils/SnowflakeIdWorker.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 
 /**

src/main/java/com/izouma/awesomeAdmin/utils/ThreadTask.java → src/main/java/com/izouma/dingdong/utils/ThreadTask.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils;
+package com.izouma.dingdong.utils;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

src/main/java/com/izouma/awesomeAdmin/utils/excel/ExcelUtils.java → src/main/java/com/izouma/dingdong/utils/excel/ExcelUtils.java

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.utils.excel;
+package com.izouma.dingdong.utils.excel;
 
 import com.alibaba.excel.EasyExcel;
-import com.izouma.awesomeAdmin.domain.User;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

src/main/java/com/izouma/awesomeAdmin/utils/excel/LocalDateConverter.java → src/main/java/com/izouma/dingdong/utils/excel/LocalDateConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils.excel;
+package com.izouma.dingdong.utils.excel;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;

src/main/java/com/izouma/awesomeAdmin/utils/excel/LocalDateTimeConverter.java → src/main/java/com/izouma/dingdong/utils/excel/LocalDateTimeConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.utils.excel;
+package com.izouma.dingdong.utils.excel;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;

src/main/java/com/izouma/awesomeAdmin/web/AuthenticationController.java → src/main/java/com/izouma/dingdong/web/AuthenticationController.java

@@ -1,11 +1,11 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.exception.AuthenticationException;
-import com.izouma.awesomeAdmin.security.JwtTokenUtil;
-import com.izouma.awesomeAdmin.security.JwtUserDetailsService;
-import com.izouma.awesomeAdmin.security.JwtUserFactory;
-import com.izouma.awesomeAdmin.service.UserService;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.exception.AuthenticationException;
+import com.izouma.dingdong.security.JwtTokenUtil;
+import com.izouma.dingdong.security.JwtUserDetailsService;
+import com.izouma.dingdong.security.JwtUserFactory;
+import com.izouma.dingdong.service.UserService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.repo.AuthorityRepo;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.dingdong.repo.AuthorityRepo;
+import com.izouma.dingdong.security.Authority;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/izouma/awesomeAdmin/web/BaseController.java → src/main/java/com/izouma/dingdong/web/BaseController.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.dto.PageQuery;
+import com.izouma.dingdong.annotations.Searchable;
+import com.izouma.dingdong.dto.PageQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;

src/main/java/com/izouma/awesomeAdmin/web/DevelopController.java → src/main/java/com/izouma/dingdong/web/DevelopController.java

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.domain.BaseEntity;
-import com.izouma.awesomeAdmin.utils.ObjUtils;
+import com.izouma.dingdong.utils.ObjUtils;
 import org.reflections.Reflections;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/izouma/awesomeAdmin/web/FileUploadController.java → src/main/java/com/izouma/dingdong/web/FileUploadController.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.service.storage.StorageService;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.service.storage.StorageService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.RandomStringUtils;

src/main/java/com/izouma/awesomeAdmin/web/GenCodeController.java → src/main/java/com/izouma/dingdong/web/GenCodeController.java

@@ -1,13 +1,13 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.izouma.awesomeAdmin.dto.gen.GenCode;
-import com.izouma.awesomeAdmin.dto.gen.TableField;
-import com.izouma.awesomeAdmin.service.GenCodeService;
-import com.izouma.awesomeAdmin.utils.JsonUtils;
-import com.izouma.awesomeAdmin.utils.PinYinUtil;
+import com.izouma.dingdong.dto.gen.GenCode;
+import com.izouma.dingdong.dto.gen.TableField;
+import com.izouma.dingdong.service.GenCodeService;
+import com.izouma.dingdong.utils.JsonUtils;
+import com.izouma.dingdong.utils.PinYinUtil;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.text.CaseUtils;

src/main/java/com/izouma/awesomeAdmin/web/MenuController.java → src/main/java/com/izouma/dingdong/web/MenuController.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.domain.Menu;
-import com.izouma.awesomeAdmin.repo.MenuRepo;
+import com.izouma.dingdong.domain.Menu;
+import com.izouma.dingdong.repo.MenuRepo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/izouma/awesomeAdmin/web/SmsController.java → src/main/java/com/izouma/dingdong/web/SmsController.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.service.sms.SmsService;
+import com.izouma.dingdong.config.Constants;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.service.sms.SmsService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/izouma/awesomeAdmin/web/SysConfigController.java → src/main/java/com/izouma/dingdong/web/SysConfigController.java

@@ -1,11 +1,11 @@
-package com.izouma.awesomeAdmin.web;
-
-import com.izouma.awesomeAdmin.domain.SysConfig;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SysConfigRepo;
-import com.izouma.awesomeAdmin.service.SysConfigService;
-import com.izouma.awesomeAdmin.utils.excel.ExcelUtils;
+package com.izouma.dingdong.web;
+
+import com.izouma.dingdong.domain.SysConfig;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.SysConfigRepo;
+import com.izouma.dingdong.service.SysConfigService;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.data.domain.Page;

src/main/java/com/izouma/awesomeAdmin/web/UserController.java → src/main/java/com/izouma/dingdong/web/UserController.java

@@ -1,14 +1,14 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.UserRepo;
-import com.izouma.awesomeAdmin.security.Authority;
-import com.izouma.awesomeAdmin.service.UserService;
-import com.izouma.awesomeAdmin.utils.ObjUtils;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
-import com.izouma.awesomeAdmin.utils.excel.ExcelUtils;
+import com.izouma.dingdong.domain.User;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.UserRepo;
+import com.izouma.dingdong.security.Authority;
+import com.izouma.dingdong.service.UserService;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.SecurityUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 

src/main/java/com/izouma/awesomeAdmin/web/WxController.java → src/main/java/com/izouma/dingdong/web/WxController.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.web;
+package com.izouma.dingdong.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
@@ -9,7 +9,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.izouma.awesomeAdmin.exception.BusinessException;
+import com.izouma.dingdong.exception.BusinessException;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;