.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/compiler.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="sky-common" />
+        <module name="sky-server" />
+        <module name="sky-pojo" />
+      </profile>
+    </annotationProcessing>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="sky-common" options="-parameters" />
+      <module name="sky-pojo" options="-parameters" />
+      <module name="sky-server" options="-parameters" />
+    </option>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/sky-common/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/sky-pojo/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/sky-server/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

pom.xml

@@ -9,15 +9,20 @@
         <version>2.7.3</version>
     </parent>
     <groupId>com.sky</groupId>
-    <artifactId>sky-take-out</artifactId>
+    <artifactId>dev-sky-serve-v1</artifactId>
     <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
+
     <modules>
         <module>sky-common</module>
         <module>sky-pojo</module>
         <module>sky-server</module>
+        <module>sky-server</module>
     </modules>
+
     <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
         <mybatis.spring>2.2.0</mybatis.spring>
         <lombok>1.18.20</lombok>
         <fastjson>1.2.76</fastjson>
@@ -25,11 +30,12 @@
         <druid>1.2.1</druid>
         <pagehelper>1.3.0</pagehelper>
         <aliyun.sdk.oss>3.10.2</aliyun.sdk.oss>
-        <knife4j>3.0.2</knife4j>
+        <knife4j>3.0.3</knife4j>
         <aspectj>1.9.4</aspectj>
         <jjwt>0.9.1</jjwt>
         <jaxb-api>2.3.1</jaxb-api>
         <poi>3.16</poi>
+        <minio>8.4.3</minio>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -122,6 +128,12 @@
                 <artifactId>wechatpay-apache-httpclient</artifactId>
                 <version>0.4.8</version>
             </dependency>
+            <!-- minio -->
+            <dependency>
+                <groupId>io.minio</groupId>
+                <artifactId>minio</artifactId>
+                <version>${minio}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

sky-common/pom.xml

@@ -1,14 +1,22 @@
-<?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"
-<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>
     <parent>
-        <artifactId>sky-take-out</artifactId>
         <groupId>com.sky</groupId>
+        <artifactId>dev-sky-serve-v1</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>sky-common</artifactId>
+    <packaging>jar</packaging>
+
+    <name>sky-common</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -30,6 +38,11 @@
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
         </dependency>
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <!--支持配置属性类，yml文件中可以提示配置项-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -49,5 +62,20 @@
             <groupId>com.github.wechatpay-apiv3</groupId>
             <artifactId>wechatpay-apache-httpclient</artifactId>
         </dependency>
+        <!-- minio -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <!-- knife4j -->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 </project>

sky-common/src/main/java/com/sky/common/constant/AutoFillConstant.java

@@ -1,12 +1,9 @@
-package com.sky.constant;
+package com.sky.common.constant;
 
 /**
  * 公共字段自动填充相关常量
  */
 public class AutoFillConstant {
-    /**
-     * 实体类中的方法名称
-     */
     public static final String SET_CREATE_TIME = "setCreateTime";
     public static final String SET_UPDATE_TIME = "setUpdateTime";
     public static final String SET_CREATE_USER = "setCreateUser";

sky-common/src/main/java/com/sky/common/constant/JwtClaimsConstant.java

@@ -1,11 +1,9 @@
-package com.sky.constant;
+package com.sky.common.constant;
 
 public class JwtClaimsConstant {
-
     public static final String EMP_ID = "empId";
     public static final String USER_ID = "userId";
     public static final String PHONE = "phone";
     public static final String USERNAME = "username";
     public static final String NAME = "name";
-
 }

sky-common/src/main/java/com/sky/common/constant/MessageConstant.java

@@ -1,11 +1,12 @@
-package com.sky.constant;
+package com.sky.common.constant;
 
 /**
  * 信息提示常量类
  */
 public class MessageConstant {
-
     public static final String PASSWORD_ERROR = "密码错误";
+    public static final String OLD_PASSWORD_ERROR = "旧密码不匹配";
+    public static final String OLD_PASSWORD_SAME_NEW_PASSWORD = "旧密码与新密码相同";
     public static final String ACCOUNT_NOT_FOUND = "账号不存在";
     public static final String ACCOUNT_LOCKED = "账号被锁定";
     public static final String UNKNOWN_ERROR = "未知错误";
@@ -22,7 +23,9 @@ public class MessageConstant {
     public static final String SETMEAL_ON_SALE = "起售中的套餐不能删除";
     public static final String DISH_BE_RELATED_BY_SETMEAL = "当前菜品关联了套餐,不能删除";
     public static final String ORDER_STATUS_ERROR = "订单状态错误";
+    public static final String ORDER_STATUS_NOT_OP = "订单已被接单或已制作";
     public static final String ORDER_NOT_FOUND = "订单不存在";
-
+    public static final String ALREADY_EXISTS = "已存在";
-    public static final String ALREADY_EXISTS = "已存在了";
+    public static final String NOT_SET_STATUS = "请先设置营业状态";
+    public static final String REQUEST_NOT_EMPTY = "请求不为空";
 }

sky-common/src/main/java/com/sky/common/constant/PasswordConstant.java

@@ -1,10 +1,9 @@
-package com.sky.constant;
+package com.sky.common.constant;
 
 /**
  * 密码常量
  */
 public class PasswordConstant {
-
+    // 默认密码
     public static final String DEFAULT_PASSWORD = "123456";
-
 }

sky-common/src/main/java/com/sky/common/constant/StatusConstant.java

@@ -1,13 +1,11 @@
-package com.sky.constant;
+package com.sky.common.constant;
 
 /**
  * 状态常量，启用或者禁用
  */
 public class StatusConstant {
-
+    //启用为1
-    //启用
     public static final Integer ENABLE = 1;
-
+    //禁用为0
-    //禁用
     public static final Integer DISABLE = 0;
 }

sky-common/src/main/java/com/sky/common/enumeration/OperationType.java

@@ -0,0 +1,10 @@
+package com.sky.common.enumeration;
+
+/**
+ * 数据库操作类型
+ * 使用AutoFill面向切面，设置枚举量
+ */
+public enum OperationType {
+    UPDATE,// 更新操作
+    INSERT// 插入操作
+}

sky-common/src/main/java/com/sky/common/exception/AccountLockedException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 账号被锁定异常
+ */
+@Slf4j
+public class AccountLockedException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public AccountLockedException() {
+    }
+
+    public AccountLockedException(String message) {
+        super(message);
+        log.error("账号被锁定异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/AccountNotFoundException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 账号不存在异常
+ */
+@Slf4j
+public class AccountNotFoundException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public AccountNotFoundException() {
+    }
+
+    public AccountNotFoundException(String message) {
+        super(message);
+        log.error("账号不存在异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/AddressBookBusinessException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 地址信息异常
+ */
+@Slf4j
+public class AddressBookBusinessException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public AddressBookBusinessException() {
+    }
+
+    public AddressBookBusinessException(String message) {
+        super(message);
+        log.error("账号不存在异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/BaseException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 业务异常
+ */
+@Slf4j
+public class BaseException extends RuntimeException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public BaseException() {
+    }
+
+    public BaseException(String message) {
+        super(message);
+        log.error("业务异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/DeletionNotAllowedException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 不允许删除异常
+ */
+@Slf4j
+public class DeletionNotAllowedException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public DeletionNotAllowedException() {
+    }
+
+    public DeletionNotAllowedException(String message) {
+        super(message);
+        log.error("不允许删除异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/LoginFailedException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 登录失败
+ */
+@Slf4j
+public class LoginFailedException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public LoginFailedException() {
+    }
+
+    public LoginFailedException(String message) {
+        super(message);
+        log.error("登录失败:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/OrderBusinessException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 订单业务异常
+ */
+@Slf4j
+public class OrderBusinessException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public OrderBusinessException() {
+    }
+
+    public OrderBusinessException(String message) {
+        super(message);
+        log.error("订单业务异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/PasswordEditFailedException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 密码修改失败异常
+ */
+@Slf4j
+public class PasswordEditFailedException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public PasswordEditFailedException() {
+    }
+
+    public PasswordEditFailedException(String message) {
+        super(message);
+        log.error("密码修改失败异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/PasswordErrorException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 密码错误异常
+ */
+@Slf4j
+public class PasswordErrorException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public PasswordErrorException() {
+    }
+
+    public PasswordErrorException(String message) {
+        super(message);
+        log.error("密码错误异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/RestTemplateException.java

@@ -0,0 +1,17 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RestTemplateException异常
+ */
+@Slf4j
+public class RestTemplateException extends BaseException {
+    public RestTemplateException() {
+    }
+
+    public RestTemplateException(String message) {
+        super(message);
+        log.error("RestTemplateException异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/SetMealEnableFailedException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 套餐启用失败异常
+ */
+@Slf4j
+public class SetMealEnableFailedException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public SetMealEnableFailedException() {
+    }
+
+    public SetMealEnableFailedException(String message) {
+        super(message);
+        log.error("套餐启用失败异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/ShoppingCartBusinessException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 购物车异常
+ */
+@Slf4j
+public class ShoppingCartBusinessException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public ShoppingCartBusinessException() {
+    }
+
+    public ShoppingCartBusinessException(String message) {
+        super(message);
+        log.error("购物车异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/exception/UserNotLoginException.java

@@ -0,0 +1,22 @@
+package com.sky.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 用户未登录异常
+ */
+@Slf4j
+public class UserNotLoginException extends BaseException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public UserNotLoginException() {
+    }
+
+    public UserNotLoginException(String message) {
+        super(message);
+        log.error("用户未登录异常:{}", message);
+    }
+}

sky-common/src/main/java/com/sky/common/properties/JwtProperties.java

@@ -1,4 +1,4 @@
-package com.sky.properties;
+package com.sky.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -8,7 +8,6 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "sky.jwt")
 @Data
 public class JwtProperties {
-
     /**
      * 管理端员工生成jwt令牌相关配置
      */
@@ -22,5 +21,4 @@ public class JwtProperties {
     private String userSecretKey;
     private long userTtl;
     private String userTokenName;
-
 }

sky-common/src/main/java/com/sky/common/properties/MinioProperties.java

@@ -1,15 +1,15 @@
-package com.sky.config;
+package com.sky.common.properties;
 
+import io.minio.MinioClient;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
-import io.minio.MinioClient;
 
-@Data
+@Component
-@Configuration
 @ConfigurationProperties(prefix = "sky.minio")
-public class MinioConfig {
+@Data
+public class MinioProperties {
     private String endpointUrl;
     private String accessKey;
     private String secretKey;

sky-common/src/main/java/com/sky/common/properties/WeChatProperties.java

@@ -0,0 +1,20 @@
+package com.sky.common.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "sky.wechat")
+@Data
+public class WeChatProperties {
+    private String appid; // 小程序的appid
+    private String secret; // 小程序的秘钥
+    private String mchid; // 商户号
+    private String mchSerialNo; // 商户API证书的证书序列号
+    private String privateKeyFilePath; // 商户私钥文件
+    private String apiV3Key; // 证书解密的密钥
+    private String weChatPayCertFilePath; // 平台证书
+    private String notifyUrl; // 支付成功的回调地址
+    private String refundNotifyUrl; // 退款成功的回调地址
+}

sky-common/src/main/java/com/sky/context/BaseContext.java

@@ -1,19 +0,0 @@
-package com.sky.context;
-
-public class BaseContext {
-
-    public static ThreadLocal<Long> threadLocal = new ThreadLocal<>();
-
-    public static void setCurrentId(Long id) {
-        threadLocal.set(id);
-    }
-
-    public static Long getCurrentId() {
-        return threadLocal.get();
-    }
-
-    public static void removeCurrentId() {
-        threadLocal.remove();
-    }
-
-}

sky-common/src/main/java/com/sky/enumeration/OperationType.java

@@ -1,18 +0,0 @@
-package com.sky.enumeration;
-
-/**
- * 数据库操作类型
- */
-public enum OperationType {
-
-    /**
-     * 更新操作
-     */
-    UPDATE,
-
-    /**
-     * 插入操作
-     */
-    INSERT
-
-}

sky-common/src/main/java/com/sky/exception/AccountLockedException.java

@@ -1,15 +0,0 @@
-package com.sky.exception;
-
-/**
- * 账号被锁定异常
- */
-public class AccountLockedException extends BaseException {
-
-    public AccountLockedException() {
-    }
-
-    public AccountLockedException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/AccountNotFoundException.java

@@ -1,15 +0,0 @@
-package com.sky.exception;
-
-/**
- * 账号不存在异常
- */
-public class AccountNotFoundException extends BaseException {
-
-    public AccountNotFoundException() {
-    }
-
-    public AccountNotFoundException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/AddressBookBusinessException.java

@@ -1,9 +0,0 @@
-package com.sky.exception;
-
-public class AddressBookBusinessException extends BaseException {
-
-    public AddressBookBusinessException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/BaseException.java

@@ -1,15 +0,0 @@
-package com.sky.exception;
-
-/**
- * 业务异常
- */
-public class BaseException extends RuntimeException {
-
-    public BaseException() {
-    }
-
-    public BaseException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/DeletionNotAllowedException.java

@@ -1,9 +0,0 @@
-package com.sky.exception;
-
-public class DeletionNotAllowedException extends BaseException {
-
-    public DeletionNotAllowedException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/LoginFailedException.java

@@ -1,10 +0,0 @@
-package com.sky.exception;
-
-/**
- * 登录失败
- */
-public class LoginFailedException extends BaseException{
-    public LoginFailedException(String msg){
-        super(msg);
-    }
-}

sky-common/src/main/java/com/sky/exception/OrderBusinessException.java

@@ -1,9 +0,0 @@
-package com.sky.exception;
-
-public class OrderBusinessException extends BaseException {
-
-    public OrderBusinessException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/PasswordEditFailedException.java

@@ -1,12 +0,0 @@
-package com.sky.exception;
-
-/**
- * 密码修改失败异常
- */
-public class PasswordEditFailedException extends BaseException{
-
-    public PasswordEditFailedException(String msg){
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/PasswordErrorException.java

@@ -1,15 +0,0 @@
-package com.sky.exception;
-
-/**
- * 密码错误异常
- */
-public class PasswordErrorException extends BaseException {
-
-    public PasswordErrorException() {
-    }
-
-    public PasswordErrorException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/SetmealEnableFailedException.java

@@ -1,13 +0,0 @@
-package com.sky.exception;
-
-/**
- * 套餐启用失败异常
- */
-public class SetmealEnableFailedException extends BaseException {
-
-    public SetmealEnableFailedException(){}
-
-    public SetmealEnableFailedException(String msg){
-        super(msg);
-    }
-}

sky-common/src/main/java/com/sky/exception/ShoppingCartBusinessException.java

@@ -1,9 +0,0 @@
-package com.sky.exception;
-
-public class ShoppingCartBusinessException extends BaseException {
-
-    public ShoppingCartBusinessException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/exception/UserNotLoginException.java

@@ -1,12 +0,0 @@
-package com.sky.exception;
-
-public class UserNotLoginException extends BaseException {
-
-    public UserNotLoginException() {
-    }
-
-    public UserNotLoginException(String msg) {
-        super(msg);
-    }
-
-}

sky-common/src/main/java/com/sky/json/JacksonObjectMapper.java

@@ -1,51 +0,0 @@
-package com.sky.json;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-
-import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
-
-/**
- * 对象映射器:基于jackson将Java对象转为json，或者将json转为Java对象
- * 将JSON解析为Java对象的过程称为 [从JSON反序列化Java对象]
- * 从Java对象生成JSON的过程称为 [序列化Java对象到JSON]
- */
-public class JacksonObjectMapper extends ObjectMapper {
-
-    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-    //public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
-    public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm";
-    public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
-
-    public JacksonObjectMapper() {
-        super();
-        //收到未知属性时不报异常
-        this.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-        //反序列化时，属性不存在的兼容处理
-        this.getDeserializationConfig().withoutFeatures(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-        SimpleModule simpleModule = new SimpleModule()
-                .addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)))
-                .addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)))
-                .addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)))
-                .addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)))
-                .addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)))
-                .addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
-
-        //注册功能模块 例如，可以添加自定义序列化器和反序列化器
-        this.registerModule(simpleModule);
-    }
-}

sky-common/src/main/java/com/sky/properties/AliOssProperties.java

@@ -1,17 +0,0 @@
-package com.sky.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "sky.alioss")
-@Data
-public class AliOssProperties {
-
-    private String endpoint;
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String bucketName;
-
-}

sky-common/src/main/java/com/sky/properties/WeChatProperties.java

@@ -1,23 +0,0 @@
-package com.sky.properties;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "sky.wechat")
-@Data
-public class WeChatProperties {
-
-    private String appid; //小程序的appid
-    private String secret; //小程序的秘钥
-    private String mchid; //商户号
-    private String mchSerialNo; //商户API证书的证书序列号
-    private String privateKeyFilePath; //商户私钥文件
-    private String apiV3Key; //证书解密的密钥
-    private String weChatPayCertFilePath; //平台证书
-    private String notifyUrl; //支付成功的回调地址
-    private String refundNotifyUrl; //退款成功的回调地址
-
-}

sky-common/src/main/java/com/sky/result/PageResult.java

@@ -1,22 +0,0 @@
-package com.sky.result;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 封装分页查询结果
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class PageResult implements Serializable {
-
-    private long total; //总记录数
-
-    private List records; //当前页数据集合
-
-}

sky-common/src/main/java/com/sky/result/Result.java

@@ -1,38 +0,0 @@
-package com.sky.result;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 后端统一返回结果
- * @param <T>
- */
-@Data
-public class Result<T> implements Serializable {
-
-    private Integer code; //编码：1成功，0和其它数字为失败
-    private String msg; //错误信息
-    private T data; //数据
-
-    public static <T> Result<T> success() {
-        Result<T> result = new Result<T>();
-        result.code = 1;
-        return result;
-    }
-
-    public static <T> Result<T> success(T object) {
-        Result<T> result = new Result<T>();
-        result.data = object;
-        result.code = 1;
-        return result;
-    }
-
-    public static <T> Result<T> error(String msg) {
-        Result result = new Result();
-        result.msg = msg;
-        result.code = 0;
-        return result;
-    }
-
-}

sky-common/src/main/java/com/sky/utils/AliOssUtil.java

@@ -1,68 +0,0 @@
-package com.sky.utils;
-
-import com.aliyun.oss.ClientException;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.OSSException;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import java.io.ByteArrayInputStream;
-
-@Data
-@AllArgsConstructor
-@Slf4j
-public class AliOssUtil {
-
-    private String endpoint;
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String bucketName;
-
-    /**
-     * 文件上传
-     *
-     * @param bytes
-     * @param objectName
-     * @return
-     */
-    public String upload(byte[] bytes, String objectName) {
-
-        // 创建OSSClient实例。
-        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
-
-        try {
-            // 创建PutObject请求。
-            ossClient.putObject(bucketName, objectName, new ByteArrayInputStream(bytes));
-        } catch (OSSException oe) {
-            System.out.println("Caught an OSSException, which means your request made it to OSS, "
-                    + "but was rejected with an error response for some reason.");
-            System.out.println("Error Message:" + oe.getErrorMessage());
-            System.out.println("Error Code:" + oe.getErrorCode());
-            System.out.println("Request ID:" + oe.getRequestId());
-            System.out.println("Host ID:" + oe.getHostId());
-        } catch (ClientException ce) {
-            System.out.println("Caught an ClientException, which means the client encountered "
-                    + "a serious internal problem while trying to communicate with OSS, "
-                    + "such as not being able to access the network.");
-            System.out.println("Error Message:" + ce.getMessage());
-        } finally {
-            if (ossClient != null) {
-                ossClient.shutdown();
-            }
-        }
-
-        //文件访问路径规则 https://BucketName.Endpoint/ObjectName
-        StringBuilder stringBuilder = new StringBuilder("https://");
-        stringBuilder
-                .append(bucketName)
-                .append(".")
-                .append(endpoint)
-                .append("/")
-                .append(objectName);
-
-        log.info("文件上传到:{}", stringBuilder.toString());
-
-        return stringBuilder.toString();
-    }
-}

sky-common/src/main/java/com/sky/utils/HttpClientUtil.java

@@ -1,179 +0,0 @@
-package com.sky.utils;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Http工具类
- */
-public class HttpClientUtil {
-
-    static final  int TIMEOUT_MSEC = 5 * 1000;
-
-    /**
-     * 发送GET方式请求
-     * @param url
-     * @param paramMap
-     * @return
-     */
-    public static String doGet(String url,Map<String,String> paramMap){
-        // 创建Httpclient对象
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-
-        String result = "";
-        CloseableHttpResponse response = null;
-
-        try{
-            URIBuilder builder = new URIBuilder(url);
-            if(paramMap != null){
-                for (String key : paramMap.keySet()) {
-                    builder.addParameter(key,paramMap.get(key));
-                }
-            }
-            URI uri = builder.build();
-
-            //创建GET请求
-            HttpGet httpGet = new HttpGet(uri);
-
-            //发送请求
-            response = httpClient.execute(httpGet);
-
-            //判断响应状态
-            if(response.getStatusLine().getStatusCode() == 200){
-                result = EntityUtils.toString(response.getEntity(),"UTF-8");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }finally {
-            try {
-                response.close();
-                httpClient.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 发送POST方式请求
-     * @param url
-     * @param paramMap
-     * @return
-     * @throws IOException
-     */
-    public static String doPost(String url, Map<String, String> paramMap) throws IOException {
-        // 创建Httpclient对象
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-
-            // 创建参数列表
-            if (paramMap != null) {
-                List<NameValuePair> paramList = new ArrayList();
-                for (Map.Entry<String, String> param : paramMap.entrySet()) {
-                    paramList.add(new BasicNameValuePair(param.getKey(), param.getValue()));
-                }
-                // 模拟表单
-                UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
-                httpPost.setEntity(entity);
-            }
-
-            httpPost.setConfig(builderRequestConfig());
-
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-
-            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return resultString;
-    }
-
-    /**
-     * 发送POST方式请求
-     * @param url
-     * @param paramMap
-     * @return
-     * @throws IOException
-     */
-    public static String doPost4Json(String url, Map<String, String> paramMap) throws IOException {
-        // 创建Httpclient对象
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
-        String resultString = "";
-
-        try {
-            // 创建Http Post请求
-            HttpPost httpPost = new HttpPost(url);
-
-            if (paramMap != null) {
-                //构造json格式数据
-                JSONObject jsonObject = new JSONObject();
-                for (Map.Entry<String, String> param : paramMap.entrySet()) {
-                    jsonObject.put(param.getKey(),param.getValue());
-                }
-                StringEntity entity = new StringEntity(jsonObject.toString(),"utf-8");
-                //设置请求编码
-                entity.setContentEncoding("utf-8");
-                //设置数据类型
-                entity.setContentType("application/json");
-                httpPost.setEntity(entity);
-            }
-
-            httpPost.setConfig(builderRequestConfig());
-
-            // 执行http请求
-            response = httpClient.execute(httpPost);
-
-            resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            try {
-                response.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return resultString;
-    }
-    private static RequestConfig builderRequestConfig() {
-        return RequestConfig.custom()
-                .setConnectTimeout(TIMEOUT_MSEC)
-                .setConnectionRequestTimeout(TIMEOUT_MSEC)
-                .setSocketTimeout(TIMEOUT_MSEC).build();
-    }
-
-}

sky-common/src/main/java/com/sky/utils/JwtUtil.java

@@ -1,58 +0,0 @@
-package com.sky.utils;
-
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.JwtBuilder;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.Map;
-
-public class JwtUtil {
-    /**
-     * 生成jwt
-     * 使用Hs256算法, 私匙使用固定秘钥
-     *
-     * @param secretKey jwt秘钥
-     * @param ttlMillis jwt过期时间(毫秒)
-     * @param claims    设置的信息
-     * @return
-     */
-    public static String createJWT(String secretKey, long ttlMillis, Map<String, Object> claims) {
-        // 指定签名的时候使用的签名算法，也就是header那部分
-        SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256;
-
-        // 生成JWT的时间
-        long expMillis = System.currentTimeMillis() + ttlMillis;
-        Date exp = new Date(expMillis);
-
-        // 设置jwt的body
-        JwtBuilder builder = Jwts.builder()
-                // 如果有私有声明，一定要先设置这个自己创建的私有的声明，这个是给builder的claim赋值，一旦写在标准的声明赋值之后，就是覆盖了那些标准的声明的
-                .setClaims(claims)
-                // 设置签名使用的签名算法和签名使用的秘钥
-                .signWith(signatureAlgorithm, secretKey.getBytes(StandardCharsets.UTF_8))
-                // 设置过期时间
-                .setExpiration(exp);
-
-        return builder.compact();
-    }
-
-    /**
-     * Token解密
-     *
-     * @param secretKey jwt秘钥 此秘钥一定要保留好在服务端, 不能暴露出去, 否则sign就可以被伪造, 如果对接多个客户端建议改造成多个
-     * @param token     加密后的token
-     * @return
-     */
-    public static Claims parseJWT(String secretKey, String token) {
-        // 得到DefaultJwtParser
-        Claims claims = Jwts.parser()
-                // 设置签名的秘钥
-                .setSigningKey(secretKey.getBytes(StandardCharsets.UTF_8))
-                // 设置需要解析的jwt
-                .parseClaimsJws(token).getBody();
-        return claims;
-    }
-
-}

sky-common/src/main/java/com/sky/utils/WeChatPayUtil.java

@@ -1,235 +0,0 @@
-package com.sky.utils;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.sky.properties.WeChatProperties;
-import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
-import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.http.HttpHeaders;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.math.BigDecimal;
-import java.security.PrivateKey;
-import java.security.Signature;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
-
-/**
- * 微信支付工具类
- */
-@Component
-public class WeChatPayUtil {
-
-    //微信支付下单接口地址
-    public static final String JSAPI = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
-
-    //申请退款接口地址
-    public static final String REFUNDS = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds";
-
-    @Autowired
-    private WeChatProperties weChatProperties;
-
-    /**
-     * 获取调用微信接口的客户端工具对象
-     *
-     * @return
-     */
-    private CloseableHttpClient getClient() {
-        PrivateKey merchantPrivateKey = null;
-        try {
-            //merchantPrivateKey商户API私钥，如何加载商户API私钥请看常见问题
-            merchantPrivateKey = PemUtil.loadPrivateKey(new FileInputStream(new File(weChatProperties.getPrivateKeyFilePath())));
-            //加载平台证书文件
-            X509Certificate x509Certificate = PemUtil.loadCertificate(new FileInputStream(new File(weChatProperties.getWeChatPayCertFilePath())));
-            //wechatPayCertificates微信支付平台证书列表。你也可以使用后面章节提到的“定时更新平台证书功能”，而不需要关心平台证书的来龙去脉
-            List<X509Certificate> wechatPayCertificates = Arrays.asList(x509Certificate);
-
-            WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
-                    .withMerchant(weChatProperties.getMchid(), weChatProperties.getMchSerialNo(), merchantPrivateKey)
-                    .withWechatPay(wechatPayCertificates);
-
-            // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签
-            CloseableHttpClient httpClient = builder.build();
-            return httpClient;
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 发送post方式请求
-     *
-     * @param url
-     * @param body
-     * @return
-     */
-    private String post(String url, String body) throws Exception {
-        CloseableHttpClient httpClient = getClient();
-
-        HttpPost httpPost = new HttpPost(url);
-        httpPost.addHeader(HttpHeaders.ACCEPT, ContentType.APPLICATION_JSON.toString());
-        httpPost.addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
-        httpPost.addHeader("Wechatpay-Serial", weChatProperties.getMchSerialNo());
-        httpPost.setEntity(new StringEntity(body, "UTF-8"));
-
-        CloseableHttpResponse response = httpClient.execute(httpPost);
-        try {
-            String bodyAsString = EntityUtils.toString(response.getEntity());
-            return bodyAsString;
-        } finally {
-            httpClient.close();
-            response.close();
-        }
-    }
-
-    /**
-     * 发送get方式请求
-     *
-     * @param url
-     * @return
-     */
-    private String get(String url) throws Exception {
-        CloseableHttpClient httpClient = getClient();
-
-        HttpGet httpGet = new HttpGet(url);
-        httpGet.addHeader(HttpHeaders.ACCEPT, ContentType.APPLICATION_JSON.toString());
-        httpGet.addHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
-        httpGet.addHeader("Wechatpay-Serial", weChatProperties.getMchSerialNo());
-
-        CloseableHttpResponse response = httpClient.execute(httpGet);
-        try {
-            String bodyAsString = EntityUtils.toString(response.getEntity());
-            return bodyAsString;
-        } finally {
-            httpClient.close();
-            response.close();
-        }
-    }
-
-    /**
-     * jsapi下单
-     *
-     * @param orderNum    商户订单号
-     * @param total       总金额
-     * @param description 商品描述
-     * @param openid      微信用户的openid
-     * @return
-     */
-    private String jsapi(String orderNum, BigDecimal total, String description, String openid) throws Exception {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("appid", weChatProperties.getAppid());
-        jsonObject.put("mchid", weChatProperties.getMchid());
-        jsonObject.put("description", description);
-        jsonObject.put("out_trade_no", orderNum);
-        jsonObject.put("notify_url", weChatProperties.getNotifyUrl());
-
-        JSONObject amount = new JSONObject();
-        amount.put("total", total.multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue());
-        amount.put("currency", "CNY");
-
-        jsonObject.put("amount", amount);
-
-        JSONObject payer = new JSONObject();
-        payer.put("openid", openid);
-
-        jsonObject.put("payer", payer);
-
-        String body = jsonObject.toJSONString();
-        return post(JSAPI, body);
-    }
-
-    /**
-     * 小程序支付
-     *
-     * @param orderNum    商户订单号
-     * @param total       金额，单位 元
-     * @param description 商品描述
-     * @param openid      微信用户的openid
-     * @return
-     */
-    public JSONObject pay(String orderNum, BigDecimal total, String description, String openid) throws Exception {
-        //统一下单，生成预支付交易单
-        String bodyAsString = jsapi(orderNum, total, description, openid);
-        //解析返回结果
-        JSONObject jsonObject = JSON.parseObject(bodyAsString);
-        System.out.println(jsonObject);
-
-        String prepayId = jsonObject.getString("prepay_id");
-        if (prepayId != null) {
-            String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
-            String nonceStr = RandomStringUtils.randomNumeric(32);
-            ArrayList<Object> list = new ArrayList<>();
-            list.add(weChatProperties.getAppid());
-            list.add(timeStamp);
-            list.add(nonceStr);
-            list.add("prepay_id=" + prepayId);
-            //二次签名，调起支付需要重新签名
-            StringBuilder stringBuilder = new StringBuilder();
-            for (Object o : list) {
-                stringBuilder.append(o).append("\n");
-            }
-            String signMessage = stringBuilder.toString();
-            byte[] message = signMessage.getBytes();
-
-            Signature signature = Signature.getInstance("SHA256withRSA");
-            signature.initSign(PemUtil.loadPrivateKey(new FileInputStream(new File(weChatProperties.getPrivateKeyFilePath()))));
-            signature.update(message);
-            String packageSign = Base64.getEncoder().encodeToString(signature.sign());
-
-            //构造数据给微信小程序，用于调起微信支付
-            JSONObject jo = new JSONObject();
-            jo.put("timeStamp", timeStamp);
-            jo.put("nonceStr", nonceStr);
-            jo.put("package", "prepay_id=" + prepayId);
-            jo.put("signType", "RSA");
-            jo.put("paySign", packageSign);
-
-            return jo;
-        }
-        return jsonObject;
-    }
-
-    /**
-     * 申请退款
-     *
-     * @param outTradeNo    商户订单号
-     * @param outRefundNo   商户退款单号
-     * @param refund        退款金额
-     * @param total         原订单金额
-     * @return
-     */
-    public String refund(String outTradeNo, String outRefundNo, BigDecimal refund, BigDecimal total) throws Exception {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("out_trade_no", outTradeNo);
-        jsonObject.put("out_refund_no", outRefundNo);
-
-        JSONObject amount = new JSONObject();
-        amount.put("refund", refund.multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue());
-        amount.put("total", total.multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue());
-        amount.put("currency", "CNY");
-
-        jsonObject.put("amount", amount);
-        jsonObject.put("notify_url", weChatProperties.getRefundNotifyUrl());
-
-        String body = jsonObject.toJSONString();
-
-        //调用申请退款接口
-        return post(REFUNDS, body);
-    }
-}

sky-pojo/pom.xml

@@ -1,27 +1,26 @@
-<?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"
-<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>
     <parent>
-        <artifactId>sky-take-out</artifactId>
         <groupId>com.sky</groupId>
+        <artifactId>dev-sky-serve-v1</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>sky-pojo</artifactId>
+    <packaging>jar</packaging>
+
+    <name>sky-pojo</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.14.0-rc2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-        </dependency>
     </dependencies>
 </project>

sky-pojo/src/main/java/com/sky/dto/CategoryDTO.java

@@ -1,22 +0,0 @@
-package com.sky.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class CategoryDTO implements Serializable {
-
-    //主键
-    private Long id;
-
-    //类型 1 菜品分类 2 套餐分类
-    private Integer type;
-
-    //分类名称
-    private String name;
-
-    //排序
-    private Integer sort;
-
-}

sky-pojo/src/main/java/com/sky/dto/CategoryPageQueryDTO.java

@@ -1,13 +0,0 @@
-package com.sky.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class CategoryPageQueryDTO implements Serializable {
-    private int page;// 页码
-    private int pageSize;// 每页记录数
-    private String name;// 分类名称
-    private Integer type;//分类类型 1菜品分类  2套餐分类
-}

sky-pojo/src/main/java/com/sky/dto/EmployeePageQueryDTO.java

@@ -1,19 +0,0 @@
-package com.sky.dto;
-
-import com.sky.entity.Employee;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class EmployeePageQueryDTO implements Serializable {
-
-    //员工姓名
-    private String name;
-
-    //页码
-    private int page;
-
-    //每页显示记录数
-    private int pageSize;
-}

sky-pojo/src/main/java/com/sky/dto/OrdersConfirmDTO.java

@@ -1,14 +0,0 @@
-package com.sky.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class OrdersConfirmDTO implements Serializable {
-
-    private Long id;
-    //订单状态 1待付款 2待接单 3 已接单 4 派送中 5 已完成 6 已取消 7 退款
-    private Integer status;
-
-}

sky-pojo/src/main/java/com/sky/pojo/dto/CategoryDTO.java

@@ -0,0 +1,21 @@
+package com.sky.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CategoryDTO implements Serializable {
+    // 主键
+    private Long id;
+    // 类型 1 菜品分类 2 套餐分类
+    private Integer type;
+    // 分类名称
+    private String name;
+    // 排序
+    private Integer sort;
+}

sky-pojo/src/main/java/com/sky/pojo/dto/CategoryPageQueryDTO.java

@@ -0,0 +1,21 @@
+package com.sky.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CategoryPageQueryDTO implements Serializable {
+    // 页码
+    private int page;
+    // 每页记录数
+    private int pageSize;
+    // 分类名称
+    private String name;
+    // 分类类型 1菜品分类  2套餐分类
+    private Integer type;
+}

sky-pojo/src/main/java/com/sky/pojo/dto/DataOverViewQueryDTO.java

@@ -1,4 +1,4 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,9 +13,6 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DataOverViewQueryDTO implements Serializable {
-
     private LocalDateTime begin;
-
     private LocalDateTime end;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/DishDTO.java

@@ -1,29 +1,32 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
-import com.sky.entity.DishFlavor;
+import com.sky.pojo.entity.DishFlavor;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DishDTO implements Serializable {
-
     private Long id;
-    //菜品名称
+    // 菜品名称
     private String name;
-    //菜品分类id
+    // 菜品分类id
     private Long categoryId;
-    //菜品价格
+    // 菜品价格
     private BigDecimal price;
-    //图片
+    // 图片
     private String image;
-    //描述信息
+    // 描述信息
     private String description;
-    //0 停售 1 起售
+    // 0 停售 1 起售
     private Integer status;
-    //口味
+    // 口味
     private List<DishFlavor> flavors = new ArrayList<>();
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/DishPageQueryDTO.java

@@ -1,22 +1,20 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DishPageQueryDTO implements Serializable {
-
     private int page;
-
     private int pageSize;
-
     private String name;
-
+    // 分类id
-    //分类id
     private Integer categoryId;
-
+    // 状态 0表示禁用 1表示启用
-    //状态 0表示禁用 1表示启用
     private Integer status;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/EmployeeDTO.java

@@ -1,22 +1,19 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class EmployeeDTO implements Serializable {
-
     private Long id;
-
     private String username;
-
     private String name;
-
     private String phone;
-
     private String sex;
-
     private String idNumber;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/EmployeeLoginDTO.java

@@ -1,12 +1,16 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel(description = "员工登录时传递的数据模型")
 public class EmployeeLoginDTO implements Serializable {
 
@@ -15,5 +19,4 @@ public class EmployeeLoginDTO implements Serializable {
 
     @ApiModelProperty("密码")
     private String password;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/EmployeePageQueryDTO.java

@@ -0,0 +1,19 @@
+package com.sky.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EmployeePageQueryDTO implements Serializable {
+    // 员工姓名
+    private String name;
+    // 页码
+    private int page;
+    // 每页显示记录数
+    private int pageSize;
+}

sky-pojo/src/main/java/com/sky/pojo/dto/GoodsSalesDTO.java

@@ -1,4 +1,4 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersCancelDTO.java

@@ -1,14 +1,16 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersCancelDTO implements Serializable {
-
     private Long id;
-    //订单取消原因
+    // 订单取消原因
     private String cancelReason;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersConfirmDTO.java

@@ -0,0 +1,16 @@
+package com.sky.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrdersConfirmDTO implements Serializable {
+    private Long id;
+    // 订单状态 1待付款 2待接单 3 已接单 4 派送中 5 已完成 6 已取消 7 退款
+    private Integer status;
+}

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersDTO.java

@@ -1,56 +1,45 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
-import com.sky.entity.OrderDetail;
+import com.sky.pojo.entity.OrderDetail;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersDTO implements Serializable {
-
     private Long id;
-
+    // 订单号
-    //订单号
     private String number;
-
+    // 订单状态 1待付款，2待派送，3已派送，4已完成，5已取消
-    //订单状态 1待付款，2待派送，3已派送，4已完成，5已取消
     private Integer status;
-
+    // 下单用户id
-    //下单用户id
     private Long userId;
-
+    // 地址id
-    //地址id
     private Long addressBookId;
-
+    // 下单时间
-    //下单时间
     private LocalDateTime orderTime;
-
+    // 结账时间
-    //结账时间
     private LocalDateTime checkoutTime;
-
+    // 支付方式 1微信，2支付宝
-    //支付方式 1微信，2支付宝
     private Integer payMethod;
-
+    // 实收金额
-    //实收金额
     private BigDecimal amount;
-
+    // 备注
-    //备注
     private String remark;
-
+    // 用户名
-    //用户名
     private String userName;
-
+    // 手机号
-    //手机号
     private String phone;
-
+    // 地址
-    //地址
     private String address;
-
+    // 收货人
-    //收货人
     private String consignee;
-
     private List<OrderDetail> orderDetails;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersPageQueryDTO.java

@@ -1,30 +1,25 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersPageQueryDTO implements Serializable {
-
     private int page;
-
     private int pageSize;
-
     private String number;
-
     private String phone;
-
     private Integer status;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime beginTime;
-
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
-
     private Long userId;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersPaymentDTO.java

@@ -1,14 +1,17 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersPaymentDTO implements Serializable {
-    //订单号
+    // 订单号
     private String orderNumber;
-
+    // 付款方式
-    //付款方式
     private Integer payMethod;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersRejectionDTO.java

@@ -1,15 +1,16 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersRejectionDTO implements Serializable {
-
     private Long id;
-
+    // 订单拒绝原因
-    //订单拒绝原因
     private String rejectionReason;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/OrdersSubmitDTO.java

@@ -1,31 +1,35 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class OrdersSubmitDTO implements Serializable {
-    //地址簿id
+    // 地址簿id
     private Long addressBookId;
-    //付款方式
+    // 付款方式
     private int payMethod;
-    //备注
+    // 备注
     private String remark;
-    //预计送达时间
+    // 预计送达时间
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime estimatedDeliveryTime;
-    //配送状态  1立即送出  0选择具体时间
+    // 配送状态  1立即送出  0选择具体时间
     private Integer deliveryStatus;
-    //餐具数量
+    // 餐具数量
     private Integer tablewareNumber;
-    //餐具数量状态  1按餐量提供  0选择具体数量
+    // 餐具数量状态  1按餐量提供  0选择具体数量
     private Integer tablewareStatus;
-    //打包费
+    // 打包费
     private Integer packAmount;
-    //总金额
+    // 总金额
     private BigDecimal amount;
 }

sky-pojo/src/main/java/com/sky/pojo/dto/PasswordEditDTO.java

@@ -1,19 +1,19 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class PasswordEditDTO implements Serializable {
-
+    // 员工id
-    //员工id
     private Long empId;
-
+    // 旧密码
-    //旧密码
     private String oldPassword;
-
+    // 新密码
-    //新密码
     private String newPassword;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/SetmealDTO.java

@@ -1,7 +1,9 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
-import com.sky.entity.SetmealDish;
+import com.sky.pojo.entity.SetmealDish;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -9,8 +11,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class SetmealDTO implements Serializable {
-
     private Long id;
     // 分类id
     private Long categoryId;
@@ -26,5 +29,4 @@ public class SetmealDTO implements Serializable {
     private String image;
     // 套餐菜品关系
     private List<SetmealDish> setmealDishes = new ArrayList<>();
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/SetmealPageQueryDTO.java

@@ -1,22 +1,20 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class SetmealPageQueryDTO implements Serializable {
-
     private int page;
-
     private int pageSize;
-
     private String name;
-
+    // 分类id
-    //分类id
     private Integer categoryId;
-
+    // 状态 0表示禁用 1表示启用
-    //状态 0表示禁用 1表示启用
     private Integer status;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/ShoppingCartDTO.java

@@ -1,13 +1,16 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ShoppingCartDTO implements Serializable {
-
     private Long dishId;
     private Long setmealId;
     private String dishFlavor;
-
 }

sky-pojo/src/main/java/com/sky/pojo/dto/UserLoginDTO.java

@@ -1,6 +1,8 @@
-package com.sky.dto;
+package com.sky.pojo.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -8,8 +10,8 @@ import java.io.Serializable;
  * C端用户登录
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class UserLoginDTO implements Serializable {
-
     private String code;
-
 }

sky-pojo/src/main/java/com/sky/pojo/entity/AddressBook.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/BaiduMap.java

@@ -0,0 +1,10 @@
+package com.sky.pojo.entity;
+
+import lombok.Data;
+
+@Data
+public class BaiduMap {
+    private String address;
+    private String output;
+    private String ak;
+}

sky-pojo/src/main/java/com/sky/pojo/entity/Category.java

@@ -1,9 +1,10 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 

sky-pojo/src/main/java/com/sky/pojo/entity/CategoryTest.java

@@ -0,0 +1,43 @@
+package com.sky.pojo.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 商品分类
+ * </p>
+ *
+ * @author Bunny
+ * @since 2024-03-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(description = "分类实体类")
+public class CategoryTest implements Serializable {
+
+    @Schema(description = "分类名称")
+    private String name;
+
+    @Schema(description = "分类图片url")
+    private String imageUrl;
+
+    @Schema(description = "父节点id")
+    private Long parentId;
+
+    @Schema(description = "分类状态: 是否显示[0-不显示，1显示]")
+    private Integer status;
+
+    @Schema(description = "排序字段")
+    private Integer orderNum;
+
+    @Schema(description = "是否存在子节点")
+    private Boolean hasChildren;
+
+    @Schema(description = "子节点List集合")
+    private List<Category> children;
+}

sky-pojo/src/main/java/com/sky/pojo/entity/Dish.java

@@ -1,9 +1,10 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

sky-pojo/src/main/java/com/sky/pojo/entity/DishFlavor.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/Employee.java

@@ -1,7 +1,9 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -30,7 +32,7 @@ public class Employee implements Serializable {
 
     private Integer status;
 
-    @JsonFormat(pattern = "yyyy年MM月dd日 HH:mm:ss")
+    //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -39,4 +41,6 @@ public class Employee implements Serializable {
     private Long createUser;
 
     private Long updateUser;
+    private String shopAddress;
+    private String employeeAddress;
 }

sky-pojo/src/main/java/com/sky/pojo/entity/OrderDetail.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/Orders.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/Setmeal.java

@@ -1,9 +1,10 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

sky-pojo/src/main/java/com/sky/pojo/entity/SetmealDish.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/ShoppingCart.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/entity/User.java

@@ -1,4 +1,4 @@
-package com.sky.entity;
+package com.sky.pojo.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data

sky-pojo/src/main/java/com/sky/pojo/vo/BusinessDataVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/vo/DishItemVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/vo/DishOverViewVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/vo/DishVO.java

@@ -1,10 +1,11 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
-import com.sky.entity.DishFlavor;
+import com.sky.pojo.entity.DishFlavor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

sky-pojo/src/main/java/com/sky/pojo/vo/EmployeeLoginVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

sky-pojo/src/main/java/com/sky/pojo/vo/OrderOverViewVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/vo/OrderPaymentVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Data
 @Builder

sky-pojo/src/main/java/com/sky/pojo/vo/OrderReportVO.java

@@ -1,4 +1,4 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sky-pojo/src/main/java/com/sky/pojo/vo/OrderStatisticsVO.java

@@ -1,6 +1,7 @@
-package com.sky.vo;
+package com.sky.pojo.vo;
 
 import lombok.Data;
+
 import java.io.Serializable;
 
 @Data