Browse Source

首次提交

houweiyu 4 years ago
commit
2a5303673c
30 changed files with 1017 additions and 0 deletions
  1. 63 0
      dinner-application/pom.xml
  2. 60 0
      dinner-application/src/main/java/com/fdage/DinnerReservationApplication.java
  3. 34 0
      dinner-application/src/main/resources/application-dev.properties
  4. 30 0
      dinner-application/src/main/resources/application-prod.properties
  5. 34 0
      dinner-application/src/main/resources/application-test.properties
  6. 30 0
      dinner-application/src/main/resources/application-uat.properties
  7. 25 0
      dinner-application/src/main/resources/application.properties
  8. 60 0
      dinner-application/src/main/resources/log4j2.xml
  9. 17 0
      dinner-core/pom.xml
  10. 16 0
      dinner-core/src/main/java/com/fdage/base/dao/TmCanteenDao.java
  11. 16 0
      dinner-core/src/main/java/com/fdage/base/dao/TmDeskDao.java
  12. 16 0
      dinner-core/src/main/java/com/fdage/base/dao/TmOrderDao.java
  13. 16 0
      dinner-core/src/main/java/com/fdage/base/dao/TmUserDao.java
  14. 100 0
      dinner-core/src/main/java/com/fdage/base/entity/TmCanteen.java
  15. 58 0
      dinner-core/src/main/java/com/fdage/base/entity/TmDesk.java
  16. 74 0
      dinner-core/src/main/java/com/fdage/base/entity/TmOrder.java
  17. 61 0
      dinner-core/src/main/java/com/fdage/base/entity/TmUser.java
  18. 16 0
      dinner-core/src/main/java/com/fdage/base/service/ITmCanteenService.java
  19. 16 0
      dinner-core/src/main/java/com/fdage/base/service/ITmDeskService.java
  20. 16 0
      dinner-core/src/main/java/com/fdage/base/service/ITmOrderService.java
  21. 16 0
      dinner-core/src/main/java/com/fdage/base/service/ITmUserService.java
  22. 20 0
      dinner-core/src/main/java/com/fdage/base/service/impl/TmCanteenServiceImpl.java
  23. 20 0
      dinner-core/src/main/java/com/fdage/base/service/impl/TmDeskServiceImpl.java
  24. 20 0
      dinner-core/src/main/java/com/fdage/base/service/impl/TmOrderServiceImpl.java
  25. 20 0
      dinner-core/src/main/java/com/fdage/base/service/impl/TmUserServiceImpl.java
  26. 5 0
      dinner-core/src/main/resources/mybatis/mappers/TmCanteenMapper.xml
  27. 5 0
      dinner-core/src/main/resources/mybatis/mappers/TmDeskMapper.xml
  28. 5 0
      dinner-core/src/main/resources/mybatis/mappers/TmOrderMapper.xml
  29. 5 0
      dinner-core/src/main/resources/mybatis/mappers/TmUserMapper.xml
  30. 143 0
      pom.xml

+ 63 - 0
dinner-application/pom.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dinner-paren</artifactId>
+        <groupId>com.4dage</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dinner-application</artifactId>
+    <packaging>war</packaging>
+
+    <build>
+        <finalName>fdage-dinner-reservation</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 工程主入口 -->
+                    <mainClass>com.fdage.DinnerReservationApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

+ 60 - 0
dinner-application/src/main/java/com/fdage/DinnerReservationApplication.java

@@ -0,0 +1,60 @@
+package com.fdage;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2021/2/18 14:16
+ * 4
+ */
+@SpringBootApplication(scanBasePackages = {"fdage.back.sdk.core" ,
+        "fdage.back.sdk.base.swagger" , "com.fdage"})
+@MapperScan(basePackages = {"com.fdage.base.dao"})
+public class DinnerReservationApplication  extends SpringBootServletInitializer {
+
+
+    /**
+     * 这个配置用于springboot全局datetime的字段的格式化输出
+     * */
+    @Bean
+    public ObjectMapper serializingObjectMapper() {
+        JavaTimeModule module = new JavaTimeModule();
+        LocalDateTimeDeserializer localDateTimeDeserializer =
+                new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        module.addDeserializer(LocalDateTime.class, localDateTimeDeserializer);
+        ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
+                .modules(module)
+                .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                .build();
+        return objectMapper;
+
+    }
+
+    /**
+     * 继承这个类SpringBootServletInitializer 并且重写这个方法
+     * 主要是为了可以在外置的tomcat上跑
+     * */
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(DinnerReservationApplication.class);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication springApplication = new SpringApplication(DinnerReservationApplication.class);
+        springApplication.run(args);
+    }
+
+}

+ 34 - 0
dinner-application/src/main/resources/application-dev.properties

@@ -0,0 +1,34 @@
+
+server.port=8285
+
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+swagger.page.title=选座小程序和管理后台相关接口
+swagger.page.version=1.0
+swagger.page.desc=选座小程序和管理后台相关接口
+swagger.page.packagePath=com.fdage
+
+#redis
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.timeout=5000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+
+
+oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.key=LTAIUrvuHqj8pvry
+oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=4d-tjw
+
+share.logo.oss.path=domain/4dhouse/
+oss.query.url=https://houseoss.4dkankan.com/
+image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
+

+ 30 - 0
dinner-application/src/main/resources/application-prod.properties

@@ -0,0 +1,30 @@
+
+server.port=8285
+
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+
+#redis
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.timeout=5000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+
+
+oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.key=LTAIUrvuHqj8pvry
+oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=4d-tjw
+
+share.logo.oss.path=domain/4dhouse/
+oss.query.url=https://houseoss.4dkankan.com/
+image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
+

+ 34 - 0
dinner-application/src/main/resources/application-test.properties

@@ -0,0 +1,34 @@
+
+server.port=8285
+
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+swagger.page.title=选座小程序和管理后台相关接口
+swagger.page.version=1.0
+swagger.page.desc=选座小程序和管理后台相关接口
+swagger.page.packagePath=com.fdage
+
+#redis
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.timeout=5000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+
+
+oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.key=LTAIUrvuHqj8pvry
+oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=4d-tjw
+
+share.logo.oss.path=domain/4dhouse/
+oss.query.url=https://houseoss.4dkankan.com/
+image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
+

+ 30 - 0
dinner-application/src/main/resources/application-uat.properties

@@ -0,0 +1,30 @@
+
+server.port=8285
+
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+
+#redis
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+spring.redis.timeout=5000ms
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.max-wait=-1
+spring.redis.jedis.pool.min-idle=0
+
+
+oss.point=http://oss-cn-shenzhen.aliyuncs.com
+oss.key=LTAIUrvuHqj8pvry
+oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=4d-tjw
+
+share.logo.oss.path=domain/4dhouse/
+oss.query.url=https://houseoss.4dkankan.com/
+image.local.path=C:\\Users\\4dage\\Desktop\\logo-file\\
+

+ 25 - 0
dinner-application/src/main/resources/application.properties

@@ -0,0 +1,25 @@
+
+
+#spring.profiles.active=prod
+spring.profiles.active=dev
+#spring.profiles.active=uat
+#sit环境,这里使用了test因为sdk的swagger使用的是test,所以这里使用sit
+#spring.profiles.active=test
+
+#应用名
+spring.application.name=dinner-reservation
+
+
+mybatis-plus.global-config.db-config.logic-delete-value=1
+mybatis-plus.global-config.db-config.logic-not-delete-value=0
+
+# 设置单个文件大小
+spring.servlet.multipart.max-file-size= 50MB
+#设置单次请求文件的总大小
+spring.servlet.multipart.max-request-size= 50MB
+
+
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver

+ 60 - 0
dinner-application/src/main/resources/log4j2.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration status="INFO">
+    <!--全局参数-->
+    <Properties>
+        <Property name="pattern">%d{yyyy-MM-dd HH:mm:ss,SSS} [%thread]  |-%-5level   %c{1}:%L - %m%n</Property>
+        <property name="LOG_HOME">var/logs/dinner-reservation/</property>
+        <property name="REQUEST_FILE_NAME">request</property>
+        <property name="INFO_FILE_NAME">log_info</property>
+    </Properties>
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout>
+                <pattern>
+                    ${pattern}
+                </pattern>
+            </PatternLayout>
+        </Console>
+
+        <RollingFile  name="info-log"
+                                 fileName="${LOG_HOME}/${INFO_FILE_NAME}.log"
+                                 filePattern="${LOG_HOME}/$${date:yyyy-MM}/${INFO_FILE_NAME}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout>
+                <pattern>
+                    ${pattern}
+                </pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="200 MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="200"/>
+        </RollingFile >
+
+        <RollingRandomAccessFile name="request-log"
+                                 fileName="${LOG_HOME}/${REQUEST_FILE_NAME}.log"
+                                 filePattern="${LOG_HOME}/$${date:yyyy-MM}/${REQUEST_FILE_NAME}-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout
+                    pattern="%date{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread][%file:%line] - %msg%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="200 MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="200"/>
+        </RollingRandomAccessFile>
+    </Appenders>
+
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="info-log" />
+            <AppenderRef ref="Console" />
+        </Root>
+        <Logger name="request" level="info"
+                additivity="false">
+            <AppenderRef ref="request-log"/>
+        </Logger>
+        <Logger name="org.springframework">
+            <AppenderRef ref="Console" />
+        </Logger>
+    </Loggers>
+</configuration>

+ 17 - 0
dinner-core/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dinner-paren</artifactId>
+        <groupId>com.4dage</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dinner-core</artifactId>
+
+    <packaging>jar</packaging>
+
+
+</project>

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/dao/TmCanteenDao.java

@@ -0,0 +1,16 @@
+package com.fdage.base.dao;
+
+import com.fdage.base.entity.TmCanteen;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 餐厅信息表 Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface TmCanteenDao extends BaseMapper<TmCanteen> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/dao/TmDeskDao.java

@@ -0,0 +1,16 @@
+package com.fdage.base.dao;
+
+import com.fdage.base.entity.TmDesk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 餐桌信息表 Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface TmDeskDao extends BaseMapper<TmDesk> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/dao/TmOrderDao.java

@@ -0,0 +1,16 @@
+package com.fdage.base.dao;
+
+import com.fdage.base.entity.TmOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface TmOrderDao extends BaseMapper<TmOrder> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/dao/TmUserDao.java

@@ -0,0 +1,16 @@
+package com.fdage.base.dao;
+
+import com.fdage.base.entity.TmUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * C端用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface TmUserDao extends BaseMapper<TmUser> {
+
+}

+ 100 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmCanteen.java

@@ -0,0 +1,100 @@
+package com.fdage.base.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 餐厅信息表
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmCanteen对象", description="餐厅信息表")
+public class TmCanteen implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键id")
+    private String id;
+
+    @ApiModelProperty(value = "餐厅名称")
+    private String name;
+
+    @ApiModelProperty(value = "评分")
+    private Double score;
+
+    @ApiModelProperty(value = "简介")
+    private String desc;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "是否是新店:0->否;1->是")
+    private Integer isNew;
+
+    @ApiModelProperty(value = "是否展示: 0->不展示;1->展示")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "场景码")
+    private String sceneNum;
+
+    @ApiModelProperty(value = "vr链接")
+    private String vrLink;
+
+    @ApiModelProperty(value = "微信小程序分享二维码链接")
+    private String wxShareQrCodeLink;
+
+    @ApiModelProperty(value = "餐厅详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "照片集")
+    private String picList;
+
+    @ApiModelProperty(value = "封面照片链接")
+    private String coverPicLink;
+
+    @ApiModelProperty(value = "是否删除: 0->不删除; 1->删除")
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最后更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建者ID")
+    private String createrId;
+
+    @ApiModelProperty(value = "创建者所在部门ID")
+    private String createrDeptId;
+
+    @ApiModelProperty(value = "前台接待员ID")
+    private String receptionistId;
+
+    @ApiModelProperty(value = "接待员名称")
+    private String receptionistName;
+
+    @ApiModelProperty(value = "接待员电话")
+    private String receptionistPhone;
+
+    @ApiModelProperty(value = "接待员头衔")
+    private String receptionistTitle;
+
+    @ApiModelProperty(value = "接待员头像")
+    private String receptionistAvatar;
+
+
+}

+ 58 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmDesk.java

@@ -0,0 +1,58 @@
+package com.fdage.base.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 餐桌信息表
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmDesk对象", description="餐桌信息表")
+public class TmDesk implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "桌子名称")
+    private String name;
+
+    @ApiModelProperty(value = "所属餐厅的id")
+    private String canteenId;
+
+    @ApiModelProperty(value = "桌子简介")
+    private String desc;
+
+    @ApiModelProperty(value = "类型: 1->包厢;2->大厅")
+    private Integer type;
+
+    @ApiModelProperty(value = "最新预定时间")
+    private LocalDateTime latestOrderTime;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除: 0->未删除;1->已删除")
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "状态:0->可预订;1->已被预定;")
+    private Integer status;
+
+
+}

+ 74 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmOrder.java

@@ -0,0 +1,74 @@
+package com.fdage.base.entity;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmOrder对象", description="")
+public class TmOrder implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "订单ID")
+    private String id;
+
+    @ApiModelProperty(value = "订单序号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "会员ID")
+    private String userId;
+
+    @ApiModelProperty(value = "订单状态: 0->待支付;1->预定成功;2->取消成功;3->取消退款成功;-1->预定失败")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除:0->未删除;1->已删除")
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "定金")
+    private BigDecimal orderPrice;
+
+    @ApiModelProperty(value = "所属餐厅id")
+    private String canteenId;
+
+    @ApiModelProperty(value = "所预定的桌子id")
+    private String deskId;
+
+    @ApiModelProperty(value = "所预定的桌子的类型:1->包厢;2->大厅")
+    private Boolean deskType;
+
+    @ApiModelProperty(value = "支付流水ID")
+    private String payId;
+
+    @ApiModelProperty(value = "付款者名称")
+    private String payName;
+
+    @ApiModelProperty(value = "支付时间")
+    private LocalDateTime payTime;
+
+    @ApiModelProperty(value = "支付状态:0->未付款;1->付款中;2->已付款;3->退款中;4->退款成功")
+    private Integer payStatus;
+
+
+}

+ 61 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmUser.java

@@ -0,0 +1,61 @@
+package com.fdage.base.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * C端用户信息表
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmUser对象", description="C端用户信息表")
+public class TmUser implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "用户ID")
+    private String id;
+
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "性别: 1->男性;2->女性")
+    private Integer gender;
+
+    @ApiModelProperty(value = "微信头像名称")
+    private String wxTitle;
+
+    @ApiModelProperty(value = "微信头像链接")
+    private String wxAvatar;
+
+    @ApiModelProperty(value = "微信的open id")
+    private String wxOpenId;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除: 0->未删除; 1->已删除")
+    private Integer isDelete;
+
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/service/ITmCanteenService.java

@@ -0,0 +1,16 @@
+package com.fdage.base.service;
+
+import com.fdage.base.entity.TmCanteen;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 餐厅信息表 服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface ITmCanteenService extends IService<TmCanteen> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/service/ITmDeskService.java

@@ -0,0 +1,16 @@
+package com.fdage.base.service;
+
+import com.fdage.base.entity.TmDesk;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 餐桌信息表 服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface ITmDeskService extends IService<TmDesk> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/service/ITmOrderService.java

@@ -0,0 +1,16 @@
+package com.fdage.base.service;
+
+import com.fdage.base.entity.TmOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface ITmOrderService extends IService<TmOrder> {
+
+}

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/service/ITmUserService.java

@@ -0,0 +1,16 @@
+package com.fdage.base.service;
+
+import com.fdage.base.entity.TmUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * C端用户信息表 服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+public interface ITmUserService extends IService<TmUser> {
+
+}

+ 20 - 0
dinner-core/src/main/java/com/fdage/base/service/impl/TmCanteenServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdage.base.service.impl;
+
+import com.fdage.base.entity.TmCanteen;
+import com.fdage.base.dao.TmCanteenDao;
+import com.fdage.base.service.ITmCanteenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 餐厅信息表 服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Service
+public class TmCanteenServiceImpl extends ServiceImpl<TmCanteenDao, TmCanteen> implements ITmCanteenService {
+
+}

+ 20 - 0
dinner-core/src/main/java/com/fdage/base/service/impl/TmDeskServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdage.base.service.impl;
+
+import com.fdage.base.entity.TmDesk;
+import com.fdage.base.dao.TmDeskDao;
+import com.fdage.base.service.ITmDeskService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 餐桌信息表 服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Service
+public class TmDeskServiceImpl extends ServiceImpl<TmDeskDao, TmDesk> implements ITmDeskService {
+
+}

+ 20 - 0
dinner-core/src/main/java/com/fdage/base/service/impl/TmOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdage.base.service.impl;
+
+import com.fdage.base.entity.TmOrder;
+import com.fdage.base.dao.TmOrderDao;
+import com.fdage.base.service.ITmOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Service
+public class TmOrderServiceImpl extends ServiceImpl<TmOrderDao, TmOrder> implements ITmOrderService {
+
+}

+ 20 - 0
dinner-core/src/main/java/com/fdage/base/service/impl/TmUserServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdage.base.service.impl;
+
+import com.fdage.base.entity.TmUser;
+import com.fdage.base.dao.TmUserDao;
+import com.fdage.base.service.ITmUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * C端用户信息表 服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-02-18
+ */
+@Service
+public class TmUserServiceImpl extends ServiceImpl<TmUserDao, TmUser> implements ITmUserService {
+
+}

+ 5 - 0
dinner-core/src/main/resources/mybatis/mappers/TmCanteenMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdage.base.dao.TmCanteenDao">
+
+</mapper>

+ 5 - 0
dinner-core/src/main/resources/mybatis/mappers/TmDeskMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdage.base.dao.TmDeskDao">
+
+</mapper>

+ 5 - 0
dinner-core/src/main/resources/mybatis/mappers/TmOrderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdage.base.dao.TmOrderDao">
+
+</mapper>

+ 5 - 0
dinner-core/src/main/resources/mybatis/mappers/TmUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdage.base.dao.TmUserDao">
+
+</mapper>

+ 143 - 0
pom.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.4dage</groupId>
+    <artifactId>dinner-paren</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <description>3D版美味不用等</description>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>dinner-application</module>
+        <module>dinner-core</module>
+    </modules>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+        <nacos.latest.version>0.2.1</nacos.latest.version>
+        <nacos-config-spring-boot.version>0.2.1</nacos-config-spring-boot.version>
+        <jedis-version>3.1.0</jedis-version>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.5.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
+    <dependencies>
+        <!-- 引入四维sdk -->
+        <dependency>
+            <groupId>org.4dage</groupId>
+            <artifactId>4dage-back-sdk</artifactId>
+            <version>1.0.2.19-RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- mybatis-plus逻辑删除依赖-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
+            <version>3.3.1.tmp</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>${jedis-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.netflix.hystrix</groupId>
+            <artifactId>hystrix-core</artifactId>
+            <version>1.5.12</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.netflix.hystrix/hystrix-javanica -->
+        <dependency>
+            <groupId>com.netflix.hystrix</groupId>
+            <artifactId>hystrix-javanica</artifactId>
+            <version>1.5.12</version>
+        </dependency>
+        <!-- http://mvnrepository.com/artifact/com.netflix.hystrix/hystrix-metrics-event-stream -->
+        <dependency>
+            <groupId>com.netflix.hystrix</groupId>
+            <artifactId>hystrix-metrics-event-stream</artifactId>
+            <version>1.5.12</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>