init

.gitignore

@@ -0,0 +1,38 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+*.log
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+/src/main/java/com/gree/mall/manager/plus/
+/src/test/
+.DS_Store
+logs/

pom.xml

@@ -0,0 +1,509 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.3.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.gree.manager</groupId>
+    <artifactId>new_mall_manager</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>new_mall_manager</name>
+    <description>Demo project for Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-security</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>org.mongodb</groupId>-->
+        <!--<artifactId>mongo-java-driver</artifactId>-->
+        <!--<version>3.2.2</version>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <!-- 分页 -->
+        <!--<dependency>-->
+        <!--<groupId>com.github.pagehelper</groupId>-->
+        <!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
+        <!--<version>1.2.13</version>-->
+        <!--<exclusions>-->
+        <!--<exclusion>-->
+        <!--<artifactId>mybatis-spring-boot-starter</artifactId>-->
+        <!--<groupId>org.mybatis.spring.boot</groupId>-->
+        <!--</exclusion>-->
+        <!--</exclusions>-->
+        <!--</dependency>-->
+        <!--mybatis-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-autoconfigure</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+        <!--mysql驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.17</version>
+        </dependency>
+        <!--访问安全-->
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.security</groupId>-->
+        <!--<artifactId>spring-security-test</artifactId>-->
+        <!--<scope>test</scope>-->
+        <!--</dependency>-->
+        <!-- druid -->
+        <!--<dependency>-->
+        <!--<groupId>com.alibaba</groupId>-->
+        <!--<artifactId>druid</artifactId>-->
+        <!--<version>1.1.19</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <!--fastjson-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.59</version>
+        </dependency>
+        <!--okhttp3-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <!--swagger接口文档框架-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+        <!-- 支持 @ConfigurationProperties 注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <!-- fix swagger input报错-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.22</version>
+        </dependency>
+        <!--更换undertow容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.60</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--SQL执行分析-->
+        <!--<dependency>-->
+        <!--<groupId>p6spy</groupId>-->
+        <!--<artifactId>p6spy</artifactId>-->
+        <!--<version>3.8.5</version>-->
+        <!--</dependency>-->
+        <!--json-->
+        <!--<dependency>-->
+        <!--<groupId>net.sf.json-lib</groupId>-->
+        <!--<artifactId>json-lib</artifactId>-->
+        <!--<version>2.3</version>-->
+        <!--<classifier>jdk15</classifier>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>com.vdurmont</groupId>-->
+        <!--<artifactId>emoji-java</artifactId>-->
+        <!--<version>4.0.0</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>2.1.6</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>1.21</version>
+        </dependency>
+
+        <!-- 图片验证码 -->
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+
+        <!--<dependency>-->
+        <!--<groupId>org.mongodb</groupId>-->
+        <!--<artifactId>mongo-java-driver</artifactId>-->
+        <!--<version>3.2.2</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!---excel导入-->
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-web</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-annotation</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>2.0.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.4</version>
+        </dependency>
+
+        <!--模板组件-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <version>2.2.6.RELEASE</version>
+        </dependency>
+        <!--模板组件END-->
+
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.1.3.RELEASE</version>
+        </dependency>
+
+
+        <!--<dependency>-->
+        <!--<groupId>net.javacrumbs.shedlock</groupId>-->
+        <!--<artifactId>shedlock-spring</artifactId>-->
+        <!--<version>4.12.0</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>net.javacrumbs.shedlock</groupId>-->
+        <!--<artifactId>shedlock-provider-redis-spring</artifactId>-->
+        <!--<version>4.12.0</version>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>6.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.wxpay</groupId>
+            <artifactId>wxpay-sdk</artifactId>
+            <version>0.0.3</version>
+        </dependency>
+
+        <!--企业微信api-->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-cp</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <!-- 微信支付 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-pay</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <!-- 微信小程序 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>4.1.0</version>
+        </dependency>
+        <!-- hutool工具 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.0.M4</version>
+        </dependency>
+        <!--forset-->
+        <dependency>
+            <groupId>com.dtflys.forest</groupId>
+            <artifactId>forest-spring-boot-starter</artifactId>
+            <version>1.5.19</version>
+        </dependency>
+
+        <!--企业微信会话存档-->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpg-jdk16</artifactId>
+            <version>1.46</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.64</version>
+        </dependency>
+
+
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <!-- 本地开发环境 -->
+            <id>dev</id>
+            <properties>
+                <profiles.active>dev</profiles.active>
+            </properties>
+            <activation>
+                <!-- 设置默认激活这个配置 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <!-- 测试环境 -->
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <!-- 正式环境 -->
+            <id>prd</id>
+            <properties>
+                <profiles.active>prd</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.plus.plugin</groupId>
+                <artifactId>plus-maven-plugin</artifactId>
+                <version>2.0.0</version>
+                <configuration>
+                    <configPath>src/main/resources/generator-${profiles.active}.properties</configPath>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+    <repositories>
+        <repository>
+            <id>nexus</id>
+            <name>Releases</name>
+            <url>http://121.43.111.127:8081/repository/maven-public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <!--snapshots默认是关闭的,需要开启  -->
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus</id>
+            <name>Releases</name>
+            <url>http://121.43.111.127:8081/repository/maven-public</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>

src/main/java/com/gree/mall/manager/ManagerApplication.java

@@ -0,0 +1,34 @@
+package com.gree.mall.manager;
+
+import com.gree.mall.manager.utils.ApplicationContextUtils;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
+
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication
+@ServletComponentScan(basePackages = {"com.gree.mall.manager"})
+@EnableAsync
+@EnableScheduling
+//@EnableFeignClients
+@EnableDiscoveryClient
+@EnableCaching
+@MapperScan(basePackages = {
+        "com.gree.mall.manager.plus.mapper",
+        "com.gree.mall.manager.commonmapper"
+})
+public class ManagerApplication {
+
+    public static void main(String[] args) {
+        ApplicationContext context = SpringApplication.run(ManagerApplication.class, args);
+        ApplicationContextUtils.setApplicationContext(context);
+    }
+
+}

src/main/java/com/gree/mall/manager/SwaggerConfig.java

@@ -0,0 +1,69 @@
+package com.gree.mall.manager;
+
+/**
+ *
+ */
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * API文档设置
+ * com.qichuan.sugar.minaapi.SwaggerConfig
+ */
+@Profile({"dev","test"})
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    @Bean
+    public Docket statisticsApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .pathMapping("/")
+                .groupName("运营后台API")
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.gree.mall.manager.controller"))
+                .paths(PathSelectors.regex("/.*"))
+                .build()
+                .apiInfo(apiBInfo())
+                .globalOperationParameters(setHeaderToken());
+    }
+
+    private ApiInfo apiBInfo() {
+
+        return new ApiInfoBuilder()
+                .title("格匠员工培训项目企业运营后台API")
+                .description("格匠员工培训项目企业运营后台API")
+                .contact(new Contact("格匠", "http://gejiang", "gejiang@gejiang.com"))
+                .version("1.0")
+                .build();
+    }
+
+    /**
+     * 设置公共header参数
+     * @return
+     */
+    private List<Parameter> setHeaderToken() {
+        ParameterBuilder tokenPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<>();
+        tokenPar.name("x-token").description("校验TOKEN").modelRef(new ModelRef("string")).defaultValue("1111").parameterType("header").required(false).build();
+        pars.add(tokenPar.build());
+        return pars;
+    }
+}

src/main/java/com/gree/mall/manager/annotation/ApiNotAuth.java

@@ -0,0 +1,11 @@
+package com.gree.mall.manager.annotation;
+
+import java.lang.annotation.*;
+
+@Target(value = ElementType.METHOD)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Documented
+public @interface ApiNotAuth {
+
+
+}

src/main/java/com/gree/mall/manager/bean/ExcelData.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ExcelData implements Serializable {
+    /**
+     * 表头
+     */
+    @ApiModelProperty(value = "表头")
+    private List<String> titles;
+
+    /**
+     * 数据
+     */
+    @ApiModelProperty(value = "数据")
+    private List<List<Object>> rows;
+
+    /**
+     * 页签名称
+     */
+    @ApiModelProperty(value = "页签名称")
+    private String name;
+}

src/main/java/com/gree/mall/manager/bean/ExcelExamData.java

@@ -0,0 +1,32 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExcelExamData{
+    /**
+     * 表头
+     */
+    private List<ExcelTitle> excelTitleBean;
+    /**
+     * 数据
+     */
+    private List<List<Object>> rows;
+    /**
+     * 页签名称
+     */
+    private String name;
+
+
+    @Data
+    public static class ExcelTitle{
+        private String title;
+        private List<String> childTitle;
+        private Short colorIndex;
+    }
+
+}

src/main/java/com/gree/mall/manager/bean/Freight/FreightTemplateBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.Freight;
+
+import com.gree.mall.manager.plus.entity.FreightTemplate;
+import com.gree.mall.manager.plus.entity.FreightTemplateDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class FreightTemplateBean extends FreightTemplate {
+
+    @ApiModelProperty("运费明细")
+    private List<FreightTemplateDetail> freightTemplateDetails;
+
+}

src/main/java/com/gree/mall/manager/bean/Freight/RegionTreeBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.Freight;
+
+import com.gree.mall.manager.plus.entity.Region;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class RegionTreeBean extends Region{
+
+    private String parentName;
+
+    public List<RegionTreeBean> child;
+}

src/main/java/com/gree/mall/manager/bean/PayDetail.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PayDetail {
+    @ApiModelProperty(value = "paySign")
+    private String paySign;
+    @ApiModelProperty(value = "微信返回的预支付id")
+    private String payPackage;
+    @ApiModelProperty(value = "paySign")
+    private String nonceStr;
+    @ApiModelProperty(value = "当前的时间")
+    private String timeStamp;
+    @ApiModelProperty("支付id")
+    private String id;
+    @ApiModelProperty("是否需要微信支付 true/false")
+    private Boolean isPay = true;
+    @ApiModelProperty("扫码支付的url")
+    private String codeUrl;
+
+
+}

src/main/java/com/gree/mall/manager/bean/SVerification.java

@@ -0,0 +1,14 @@
+package com.gree.mall.manager.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SVerification implements Serializable {
+    @ApiModelProperty(name = "code", value = "code")
+    private String code;
+    @ApiModelProperty(name = "pic", value = "64位编码")
+    private String pic;//64位编码
+}

src/main/java/com/gree/mall/manager/bean/activity/CustomSecSpecBean.java

@@ -0,0 +1,50 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CustomSecSpecBean {
+
+    @ApiModelProperty("秒杀商品规格id")
+    private String secKillSpecId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("秒杀图片链接")
+    private String imgUrl;
+
+    @ApiModelProperty("划线价")
+    private String orgPrice;
+
+    @ApiModelProperty("已售数量")
+    private Long soldNum;
+
+    @ApiModelProperty("秒杀价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("分账金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("秒杀开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("秒杀结束时间")
+    private Date endTime;
+
+    @ApiModelProperty(value = "分销比例")
+    private Double sharePercent;
+
+    @ApiModelProperty("秒杀状态,0全部,1未开始,2进行中,3已结束,4已关闭")
+    private Integer status;
+
+
+}

src/main/java/com/gree/mall/manager/bean/activity/CustomSpecBean.java

@@ -0,0 +1,50 @@
+package com.gree.mall.manager.bean.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CustomSpecBean {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+
+    @ApiModelProperty("商品规格Id")
+    private String goodsSpecId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("商品图片")
+    private String imgUrl;
+
+    @ApiModelProperty("商品价格")
+    private String goodsPrice;
+
+    @ApiModelProperty("商品库存")
+    private String stockNum;
+
+    @ApiModelProperty("商品规格名")
+    private String name;
+
+    @ApiModelProperty("商品规格值")
+    private String specValue;
+
+    @ApiModelProperty(value = "分销比例")
+    private Double sharePercent;
+
+    @ApiModelProperty("分账金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("划线价")
+    private String orgPrice;
+
+    @ApiModelProperty("已售数量")
+    private Long salesVolume;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionApplyBean.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionApply;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PromotionApplyBean extends PromotionApply {
+
+    @ApiModelProperty("网点名称")
+    private String adminWebsitName;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionGoods.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGoods {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("商品图")
+    private String goodsImgSrc;
+    @ApiModelProperty("活动规格列表")
+    private List<PromotionGroupSpec> specs;
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroup;
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import com.gree.mall.manager.plus.entity.PromotionGroupUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGroupBean extends PromotionGroup {
+
+    @ApiModelProperty("商品详情")
+    private List<PromotionGoods> goods;
+
+    @ApiModelProperty("团员id")
+    private List<PromotionGroupUser> promotionGroupUsers;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupDetail.java

@@ -0,0 +1,38 @@
+package com.gree.mall.manager.bean.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionGroupDetail {
+
+    @ApiModelProperty("用户id")
+    private String userId;
+    @ApiModelProperty("团长名称")
+    private String nickName;
+    @ApiModelProperty("所属网点")
+    private String websitName;
+    @ApiModelProperty("职务")
+    private String position;
+    @ApiModelProperty("手机号码")
+    private String phone;
+    @ApiModelProperty("首次分享时间")
+    private Date firstTime;
+    @ApiModelProperty("分享次数")
+    private Integer shareNum;
+    @ApiModelProperty("订单数量")
+    private Integer orderNum;
+    @ApiModelProperty("订单台数")
+    private Integer goodsNum;
+    @ApiModelProperty("成交金额")
+    private BigDecimal orderTotalAmount;
+    @ApiModelProperty("团长分佣总额")
+    private BigDecimal shareTotalAmount;
+    @ApiModelProperty("团长已分佣金额")
+    private BigDecimal settledAmount;
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupList.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class PromotionGroupList extends PromotionGroup {
+
+    @ApiModelProperty("参数产品数量")
+    private Integer goodsNum;
+    @ApiModelProperty("订单数量")
+    private Integer orderNum;
+    @ApiModelProperty("订单台数")
+    private Integer orderDetailNum;
+    @ApiModelProperty("订单总金额")
+    private BigDecimal orderTotalAmount;
+    @ApiModelProperty("团长分佣总额")
+    private BigDecimal shareTotalAmount;
+
+
+}

src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupSpecBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
+import com.gree.mall.manager.plus.entity.PromotionGroupSpecUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionGroupSpecBean extends PromotionGroupSpec {
+
+    @ApiModelProperty("团长集合")
+    private List<PromotionGroupSpecUser> promotionGroupSpecUsers;
+}

src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class SecKillActivityBean extends SecKillActivity {
+
+    @ApiModelProperty("秒杀商品规格列表")
+    private List<SecKillActivitySpecBean> goodsSpecs;
+    @ApiModelProperty("秒杀场次列表")
+    private List<SecKillStage> stages;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/SecKillActivitySpecBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class SecKillActivitySpecBean extends SecKillActivitySpec {
+    @ApiModelProperty("商品总库存")
+    private Integer stockNum;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityStageBean.java

@@ -0,0 +1,21 @@
+package com.gree.mall.manager.bean.activity;
+
+import com.gree.mall.manager.plus.entity.SecKillActivity;
+import com.gree.mall.manager.plus.entity.SecKillStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+@ApiModel
+@Data
+public class SecKillActivityStageBean extends SecKillActivity {
+
+    @ApiModelProperty("秒杀场次列表")
+    private List<SecKillStage> stages;
+    @ApiModelProperty("状态1未开始,2进行中,3已结束")
+    private Integer activityStatus;
+    @ApiModelProperty("秒杀商品数量")
+    private Integer specCount;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawBean.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
+import com.gree.mall.manager.plus.entity.PromotionLuckDrawCoupon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawBean extends PromotionLuckDraw {
+
+    @NotNull
+    @ApiModelProperty("优惠券")
+    private List<PromotionLuckDrawCouponBean> promotionLuckDrawCoupons;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCodeBean.java

@@ -0,0 +1,41 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawCodeBean extends PromotionLuckDraw {
+
+    @ApiModelProperty("券名称")
+    private String couponName;
+    @ApiModelProperty("券类型 SATISFY=满减券 GOODS=商品券 DISCOUNT=折扣券")
+    private String couponType;
+    @ApiModelProperty("券面值")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("兑换码")
+    private String code;
+    @ApiModelProperty("状态 0=未兑换 1=已兑换未使用 2=已使用")
+    private Integer status2;
+    @ApiModelProperty("领取人昵称")
+    private String userNickName;
+    @ApiModelProperty("领取人手机号")
+    private String userMobile;
+    @ApiModelProperty("领取人兑换时间")
+    private Date userExchangeTime;
+    @ApiModelProperty("领取人使用时间")
+    private Date userUseTime;
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("订单用户")
+    private String userName;
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+
+
+}

src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCouponBean.java

@@ -0,0 +1,30 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.PromotionLuckDrawCoupon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawCouponBean extends PromotionLuckDrawCoupon {
+
+    @ApiModelProperty("商品券对应商品id")
+    private List<String> goodsIds;
+
+    @ApiModelProperty("商品券对应的商品（详情用，新增不用传）")
+    private List<Goods> goodsList;
+
+    @ApiModelProperty("兑换数量（详情用，新增不用传）")
+    private Integer dhsl = 0;
+    @ApiModelProperty("剩余兑换数量（详情用，新增不用传）")
+    private Integer sydhsl = 0;
+    @ApiModelProperty("使用数量（详情用，新增不用传）")
+    private Integer sysl = 0;
+    @ApiModelProperty("未使用数量（详情用，新增不用传）")
+    private Integer wsysl = 0;
+
+}

src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawList.java

@@ -0,0 +1,34 @@
+package com.gree.mall.manager.bean.activity.luckdraw;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class PromotionLuckDrawList {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("商户")
+    private String companyWechatName;
+    @ApiModelProperty("活动名称")
+    private String name;
+    @ApiModelProperty("优惠券总数")
+    private Integer total;
+    @ApiModelProperty("兑换总数")
+    private Integer exchangeTotal;
+    @ApiModelProperty("剩余兑换数量")
+    private Integer surplusExchange;
+    @ApiModelProperty("使用总数")
+    private Integer useTotal;
+    @ApiModelProperty("未使用数量")
+    private Integer notUse;
+    @ApiModelProperty("状态 true/false")
+    private Boolean status;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminModuleTree.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminModule;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminModuleTree extends AdminModule {
+
+    @ApiModelProperty("子级")
+    private List<AdminModuleTree> children = new ArrayList<>();
+    @ApiModelProperty("是否显示")
+    private Boolean show = false;
+
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminUserBean.java

@@ -0,0 +1,51 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.AdminUserCompanyRela;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminUserBean extends AdminUser {
+
+    @ApiModelProperty("企业id")
+    private String corpId;
+    @ApiModelProperty("小程序应用id")
+    private Integer agentId1;
+    @ApiModelProperty("企业微信小程序密钥")
+    private String secret1;
+    @ApiModelProperty("标签密钥")
+    private String secret2;
+    @ApiModelProperty("通讯录密钥")
+    private String secret3;
+    @ApiModelProperty("token")
+    private String token;
+    @ApiModelProperty("所属公司")
+    private List<AdminUserCompanyRela> adminUserCompanyRelaList;
+    @ApiModelProperty("appId")
+    private String appId;
+    private String mchId;
+    private String mchKey;
+    private String subAppId;
+    private String subSecret;
+    private String subMchId;
+    private String template;
+    @ApiModelProperty("小程序名称")
+    private String minAppName;
+    @ApiModelProperty("小程序授权页logo")
+    private String minLogo1;
+    @ApiModelProperty("小程序通用logo")
+    private String minLogo2;
+    @ApiModelProperty("小程序默认头像logo")
+    private String minLogo3;
+    @ApiModelProperty("部门id集合")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("使用小程序模板类型:  1=模板1 2=模板2")
+    private Integer useTemplate;
+    @ApiModelProperty("退款是否要密码 true=是 false=否")
+    private Boolean isRefundPassword = false;
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -0,0 +1,29 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AdminUserCom extends AdminUser {
+
+    @ApiModelProperty("部门id")
+    private List<String> adminWebsitIds;
+    @ApiModelProperty("只读帐号")
+    private Boolean onlyRead = false;
+    @ApiModelProperty("企业微信id")
+    private List<String> companyWechatIds;
+    @ApiModelProperty("企微id")
+    private List<String> corpIds;
+    @ApiModelProperty("企业微信id")
+    private String corpId;
+    @ApiModelProperty("当前登录人企业微信id")
+    private String loginCompanyWechatId;
+    @ApiModelProperty("当前登录人企业名称")
+    private String loginCompanyName;
+    @ApiModelProperty("当前登录人所使用的企业微信配置")
+    private AdminCompanyWechat adminCompanyWechat;
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.WebsitZone;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminWebsitBean extends AdminUser {
+    @ApiModelProperty("weidsitIds")
+    private List<WebsitZone> weidsitIds;
+}

src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitTree.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.AdminWebsit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class AdminWebsitTree extends AdminWebsit {
+
+    @ApiModelProperty("children")
+    private List<AdminWebsitTree> children;
+
+}

src/main/java/com/gree/mall/manager/bean/admin/EnterpriseWechatWorkerImportList.java

@@ -0,0 +1,14 @@
+package com.gree.mall.manager.bean.admin;
+
+import com.gree.mall.manager.plus.entity.EnterpriseWechatWorker;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="EnterpriseWechatWorker对象", description="嘉讯茂企业微信成员信息导出")
+public class EnterpriseWechatWorkerImportList extends EnterpriseWechatWorker {
+
+    @ApiModelProperty("部门编号")
+    private String websitNum;
+}

src/main/java/com/gree/mall/manager/bean/admin/ExternalMapBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.admin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExternalMapBean {
+
+    @ApiModelProperty("token")
+    private String token;
+
+    @ApiModelProperty("url")
+    private String url;
+
+    @ApiModelProperty("userid")
+    private String userid;
+}

src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminCompanyWechatReqBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="AdminCompanyWechatReqBean对象", description="新增商户dto")
+public class AdminCompanyWechatReqBean extends AdminCompanyWechat {
+
+    private String userName;
+    private String password;
+    private String linkName;
+    private String linkPhone;
+    private String address;
+    private String nickName;
+}

src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminCompanyWechatTemplateUpdateReqDto.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechatTemplate;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="AdminCompanyWechatUpdateReqDto对象", description="编辑商户dto")
+public class AdminCompanyWechatTemplateUpdateReqDto {
+
+    @ApiModelProperty(value = "企业的微信配置id")
+    private String companyWechatId;
+    @ApiModelProperty("使用小程序模板:  1=模板1 2=模板2 ")
+    private Integer useTemplate;
+    @ApiModelProperty(value = "主log")
+    private String mainLog;
+    @ApiModelProperty("通用loc")
+    private String commonLog;
+    @ApiModelProperty("头像log")
+    private String minLogo;
+    @ApiModelProperty("模板信息")
+    List<AdminCompanyWechatTemplate> companyWechatTemplatesList;
+}

src/main/java/com/gree/mall/manager/bean/admin/reqDto/AdminUserAddReqBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.admin.reqDto;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="AdminUserAddBean对象", description="新增用户对象")
+public class AdminUserAddReqBean extends AdminUser {
+
+    @ApiModelProperty("部门id集合")
+    private List<String> adminWebsitIds;
+}

src/main/java/com/gree/mall/manager/bean/admin/respDto/AdminCompanyWechatRespPageBean.java

@@ -0,0 +1,36 @@
+package com.gree.mall.manager.bean.admin.respDto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
+import com.gree.mall.manager.plus.entity.AdminUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "商戶列表响应bean")
+@Data
+public class AdminCompanyWechatRespPageBean extends AdminCompanyWechat {
+
+    private AdminUser adminUser;
+
+    @TableId(value = "admin_user_id", type = IdType.ID_WORKER_STR)
+    private String adminUserId;
+    @ApiModelProperty(value = "用户名")
+    private String nickName;
+    @ApiModelProperty(value = "帐号")
+    private String userName;
+    @ApiModelProperty(value = "负责人")
+    private String linkName;
+    @ApiModelProperty(value = "角色名")
+    private String roleName;
+    @ApiModelProperty(value = "联系人电话")
+    private String linkPhone;
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+    @ApiModelProperty(value = "地址")
+    private String address;
+    @ApiModelProperty(value = "状态: true=正常  false=冻结")
+    private Boolean status;
+
+}

src/main/java/com/gree/mall/manager/bean/container/DelayBucket.java

@@ -0,0 +1,107 @@
+package com.gree.mall.manager.bean.container;
+
+import com.alibaba.fastjson.JSON;
+import com.gree.mall.manager.bean.delay.DelayJob;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.core.BoundZSetOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 延时处理队列
+ * @author change
+ *
+ **/
+@Slf4j
+@Component
+public class DelayBucket {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private static AtomicInteger index = new AtomicInteger(0);
+
+    @Value("${thread.size}")
+    private int bucketsSize;
+
+    private List <String> bucketNames = new ArrayList <>();
+
+    @Bean
+    public List <String> createBuckets() {
+        for (int i = 0; i < bucketsSize; i++) {
+            bucketNames.add("bucket" + i);
+        }
+        return bucketNames;
+    }
+
+    /**
+     * 获得桶的名称
+     * @return
+     */
+    private String getThisBucketName() {
+        int thisIndex = index.addAndGet(1);
+        int i1 = thisIndex % bucketsSize;
+        return bucketNames.get(i1);
+    }
+
+    /**
+     * 获得桶集合
+     * @param bucketName
+     * @return
+     */
+    private BoundZSetOperations getBucket(String bucketName) {
+        return redisTemplate.boundZSetOps(bucketName);
+    }
+
+    /**
+     * 放入延时任务
+     * @param job
+     */
+    public void addDelayJob(DelayJob job) {
+        log.info("添加延迟任务:{}", JSON.toJSONString(job));
+        String thisBucketName = getThisBucketName();
+        BoundZSetOperations bucket = getBucket(thisBucketName);
+        bucket.add(job,job.getDelayDate());
+    }
+
+    /**
+     * 获得最新的延期任务
+     * @return
+     */
+    public DelayJob getFirstDelayTime(Integer index) {
+        String name = bucketNames.get(index);
+        BoundZSetOperations bucket = getBucket(name);
+        Set<ZSetOperations.TypedTuple> set = bucket.rangeWithScores(0, 1);
+        if (CollectionUtils.isEmpty(set)) {
+            return null;
+        }
+        ZSetOperations.TypedTuple typedTuple = (ZSetOperations.TypedTuple) set.toArray()[0];
+        Object value = typedTuple.getValue();
+        if (value instanceof DelayJob) {
+            return (DelayJob) value;
+        }
+        return null;
+    }
+
+    /**
+     * 移除延时任务
+     * @param index
+     * @param delayJob
+     */
+    public void removeDelayTime(Integer index,DelayJob delayJob) {
+        String name = bucketNames.get(index);
+        BoundZSetOperations bucket = getBucket(name);
+        bucket.remove(delayJob);
+    }
+
+}

src/main/java/com/gree/mall/manager/bean/container/JobPool.java

@@ -0,0 +1,63 @@
+package com.gree.mall.manager.bean.container;
+
+import com.alibaba.fastjson.JSON;
+import com.gree.mall.manager.bean.delay.Job;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundHashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 任务池
+ * @author change
+ *
+ **/
+@Component
+@Slf4j
+public class JobPool {
+    
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private String NAME = "job.pool";
+    
+    private BoundHashOperations getPool () {
+        BoundHashOperations ops = redisTemplate.boundHashOps(NAME);
+        return ops;
+    }
+
+    /**
+     * 添加任务
+     * @param job
+     */
+    public void addJob (Job job) {
+        log.info("任务池添加任务：{}", JSON.toJSONString(job));
+        getPool().put(job.getId(),job);
+        return ;
+    }
+
+    /**
+     * 获得任务
+     * @param jobId
+     * @return
+     */
+    public Job getJob(String jobId) {
+        Object o = getPool().get(jobId);
+        if (o instanceof Job) {
+            return (Job) o;
+        }
+        return null;
+    }
+
+    /**
+     * 移除任务
+     * @param jobId
+     */
+    public void removeDelayJob (String jobId) {
+        log.info("任务池移除任务：{}",jobId);
+        // 移除任务
+        getPool().delete(jobId);
+    }
+}

src/main/java/com/gree/mall/manager/bean/container/ReadyQueue.java

@@ -0,0 +1,64 @@
+package com.gree.mall.manager.bean.container;
+
+import com.alibaba.fastjson.JSON;
+import com.gree.mall.manager.bean.delay.DelayJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author change
+ *
+ **/
+@Component
+@Slf4j
+public class ReadyQueue {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private String NAME = "process.queue";
+
+    private String getKey(String topic) {
+        return NAME + topic;
+    }
+
+    /**
+     * 获得队列
+     * @param topic
+     * @return
+     */
+    private BoundListOperations getQueue (String topic) {
+        BoundListOperations ops = redisTemplate.boundListOps(getKey(topic));
+        return ops;
+    }
+
+    /**
+     * 设置任务
+     * @param delayJob
+     */
+    public void pushJob(DelayJob delayJob) {
+        log.info("执行队列添加任务:{}",delayJob);
+        BoundListOperations listOperations = getQueue(delayJob.getTopic());
+        listOperations.leftPush(delayJob);
+    }
+
+    /**
+     * 移除并获得任务
+     * @param topic
+     * @return
+     */
+    public DelayJob popJob(String topic) {
+        BoundListOperations listOperations = getQueue(topic);
+        Object o = listOperations.leftPop();
+        if (o instanceof DelayJob) {
+            log.info("执行队列取出任务:{}", JSON.toJSONString((DelayJob) o));
+            return (DelayJob) o;
+        }
+        return null;
+    }
+    
+}

src/main/java/com/gree/mall/manager/bean/count/CountBean.java

@@ -0,0 +1,40 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class CountBean {
+
+    @ApiModelProperty("累计销售")
+    private Integer total = 0;
+    @ApiModelProperty("已售中商品")
+    private Integer sold = 0;
+    @ApiModelProperty("待发货数量")
+    private Integer dfh = 0;
+    @ApiModelProperty("维权订单数量")
+    private Integer refund = 0;
+    @ApiModelProperty("待审核提现/结算金额")
+    private BigDecimal orderShareAmount;
+    @ApiModelProperty("今日访客数量")
+    private Integer todayVisit = 0;
+    @ApiModelProperty("昨日访客")
+    private Integer yestodayVisit = 0;
+    @ApiModelProperty("今日订单数")
+    private Integer todayOrder = 0;
+    @ApiModelProperty("昨日订单数")
+    private Integer yestodayOrder = 0;
+    @ApiModelProperty("今日收益")
+    private BigDecimal todayProfit = new BigDecimal(0);
+    @ApiModelProperty("昨日收益")
+    private BigDecimal yestodayProfit = new BigDecimal(0);
+    @ApiModelProperty("下单转化率")
+    private BigDecimal orderTax = new BigDecimal(0);
+
+
+
+}

src/main/java/com/gree/mall/manager/bean/count/CountOrderBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class CountOrderBean {
+
+    @ApiModelProperty("成交量")
+    private Integer orderNum = 0;
+    @ApiModelProperty("成交额")
+    private BigDecimal amount = new BigDecimal(0);
+    @ApiModelProperty("人均消费")
+    private BigDecimal avgAmount = new BigDecimal(0);
+
+    @ApiModelProperty("x轴")
+    private String[] x;
+    //各时段订单数
+    private int[] countAry ;
+
+}

src/main/java/com/gree/mall/manager/bean/count/GoodsRankBean.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class GoodsRankBean {
+
+    @ApiModelProperty("商品名称")
+    private String goodsName = "";
+    @ApiModelProperty("成交量")
+    private Integer num = 0;
+    @ApiModelProperty("成交金额")
+    private BigDecimal payAmount = new BigDecimal(0);
+
+}

src/main/java/com/gree/mall/manager/bean/count/WebsitSaleCountBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.count;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class WebsitSaleCountBean {
+
+    @ApiModelProperty("当月销售额")
+    private BigDecimal monthAmount;
+    @ApiModelProperty("当月台数")
+    private Integer monthNum;
+    @ApiModelProperty("当天销售额")
+    private BigDecimal dayAmount;
+    @ApiModelProperty("当天台数")
+    private Integer dayNum;
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/BuyGoodsInfo.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.coupon;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class BuyGoodsInfo {
+
+    @ApiModelProperty( value = "商品名称")
+    private String goodsName;
+
+    @ApiModelProperty( value = "商品件数")
+    private int goodsCount;
+
+    @ApiModelProperty( value = "商品件数")
+    private int memberCount;
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponBean.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class CouponBean extends Coupon {
+
+    @ApiModelProperty( value = "商品列表")
+    private List<CouponGoods> goodsList;
+
+    @ApiModelProperty( value = "待发券标签列表")
+    private List<CouponTag> tagList;
+
+    @ApiModelProperty( value = "待发券用户列表")
+    private List<CouponUserTypeBean> userList;
+
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponDataBean.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.coupon;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CouponDataBean {
+
+    @ApiModelProperty( value = "用券总成交额")
+    private BigDecimal totalSaleValue;
+
+    @ApiModelProperty( value = "优惠总金额")
+    private BigDecimal totalDiscountValue;
+
+    @ApiModelProperty( value = "购买商品件数")
+    private int buyGoodsCount;
+
+    @ApiModelProperty( value = "购买商品明细")
+    private List<BuyGoodsInfo> buyGoodsInfoList;
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponDetailBean.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.Coupon;
+import com.gree.mall.manager.plus.entity.CouponGoods;
+import com.gree.mall.manager.plus.entity.CouponTag;
+import com.gree.mall.manager.plus.entity.CouponUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class CouponDetailBean extends Coupon {
+    @ApiModelProperty( value = "商品列表")
+    private List<CouponGoods> goodsList;
+
+    @ApiModelProperty( value = "待发券标签列表")
+    private List<CouponTagBean> tagList;
+
+    @ApiModelProperty( value = "待发券用户列表")
+    private List<CouponUserBean> userList;
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponExportBean.java

@@ -0,0 +1,59 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.CouponGoods;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ApiModel
+@Data
+public class CouponExportBean {
+    @ApiModelProperty(value = "领取时间")
+    private Date receiveTime;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String couponName;
+
+    @ApiModelProperty("发放总量")
+    private Integer couponAmount;
+
+    @ApiModelProperty("领取数量")
+    private Integer receiveAmount;
+
+    @ApiModelProperty("使用数量")
+    private Integer usedAmount;
+
+    @ApiModelProperty("优惠券金额")
+    private Integer couponValue;
+
+    @ApiModelProperty(value = "状态")
+    private Boolean status;
+
+    @ApiModelProperty(value = "使用时间")
+    private Date usedTime;
+
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "手机")
+    private String mobile;
+
+    @ApiModelProperty(value = "业务员手机")
+    private String workPhone;
+
+    @ApiModelProperty(value = "业务员名称")
+    private String workName;
+
+    @ApiModelProperty(value = "网点名称")
+    private String websitName;
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponPageBean.java

@@ -0,0 +1,25 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gree.mall.manager.plus.entity.Coupon;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class CouponPageBean extends Coupon{
+
+    @ApiModelProperty(value = "领取数量")
+    private Integer receivedCount;
+
+    @ApiModelProperty(value = "使用数量")
+    private Integer usedCount;
+
+    @ApiModelProperty(value = "优惠券状态")
+    private String releaseFlag;
+
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponTagBean.java

@@ -0,0 +1,27 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.CouponGoods;
+import com.gree.mall.manager.plus.entity.CouponTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class CouponTagBean{
+
+    @ApiModelProperty( value = "tag分组id")
+    private String couponTagId;
+    @ApiModelProperty( value = "tag分组id")
+    private String groupId;
+    @ApiModelProperty( value = "tag分组名")
+    private String groupName;
+    @ApiModelProperty( value = "tag名")
+    private String name;
+    @ApiModelProperty( value = "tag Id")
+    private String tagId;
+
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponUserBean.java

@@ -0,0 +1,35 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.CouponUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class CouponUserBean extends CouponUser {
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "用户类型")
+    private String type;
+
+    @ApiModelProperty(value = "国家")
+    private String country;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+}

src/main/java/com/gree/mall/manager/bean/coupon/CouponUserTypeBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.coupon;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class CouponUserTypeBean {
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    @ApiModelProperty(value = "角色 GENERAL=普通用户 SERVICE=业务员")
+    private String type;
+}

src/main/java/com/gree/mall/manager/bean/coupon/ReissueCouponBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.coupon;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class ReissueCouponBean {
+    @ApiModelProperty(value = "优惠券id")
+    private  String couponId;
+
+    @ApiModelProperty(value = "用户列表")
+    private List<CouponUserTypeBean> userIds;
+}

src/main/java/com/gree/mall/manager/bean/coupon/UserCouponBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.coupon;
+
+import com.gree.mall.manager.plus.entity.UserCoupon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UserCouponBean extends UserCoupon {
+
+    //商品券所对应的goodsId
+    private String goodsId;
+    @ApiModelProperty("用户昵称")
+    private String userName;
+    @ApiModelProperty("用户手机号")
+    private String mobile;
+
+}

src/main/java/com/gree/mall/manager/bean/delay/DelayJob.java

@@ -0,0 +1,46 @@
+package com.gree.mall.manager.bean.delay;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 延迟任务
+ * @author change
+ *
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DelayJob implements Serializable {
+
+
+    /**
+     * 延迟任务的唯一标识
+     */
+    private String jodId;
+    
+    /**
+     * 任务的执行时间
+     */
+    private long delayDate;
+
+    /**
+     * 任务类型（具体业务类型）
+     */
+    private String topic;
+
+
+    public DelayJob(Job job) {
+        this.jodId = job.getId();
+        this.delayDate = System.currentTimeMillis() + job.getDelayTime();
+        this.topic = job.getTopic();
+    }
+
+    public DelayJob(Object value, Double score) {
+        this.jodId = String.valueOf(value);
+        this.delayDate = System.currentTimeMillis() + score.longValue();
+    }
+}

src/main/java/com/gree/mall/manager/bean/delay/Job.java

@@ -0,0 +1,56 @@
+package com.gree.mall.manager.bean.delay;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gree.mall.manager.constant.JobStatus;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 任务
+ * @author change
+ *
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Job implements Serializable {
+
+    /**
+     * 延迟任务的唯一标识，用于检索任务
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String id;
+
+    /**
+     * 任务类型（具体业务类型）
+     */
+    private String topic;
+
+    /**
+     * 任务的延迟时间
+     */
+    private long delayTime;
+
+    /**
+     * 任务的执行超时时间
+     */
+    private long ttrTime;
+
+    /**
+     * 任务具体的消息内容，用于处理具体业务逻辑用
+     */
+    private String message;
+
+    /**
+     * 重试次数
+     */
+    private int retryCount;
+    /**
+     * 任务状态
+     */
+    private JobStatus status;
+}

src/main/java/com/gree/mall/manager/bean/exchange/GiftExchangeCodeBean.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.exchange;
+
+import com.gree.mall.manager.plus.entity.GiftExchangeCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class GiftExchangeCodeBean extends GiftExchangeCode {
+
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("初次生成时间")
+    private Date firstTime;
+    @ApiModelProperty("使用数量")
+    private Integer useNum;
+    @ApiModelProperty("总生成金额")
+    private BigDecimal totalAmount;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/ActiveGoodsAddReqBean.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.goods;
+
+
+import com.gree.mall.manager.plus.entity.Goods;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class ActiveGoodsAddReqBean {
+
+    @ApiModelProperty("唯一id(type>=2可取小程序模板id)")
+    private String objectId;
+    @ApiModelProperty("类型: 1=新维度分类，2=首页弹窗， 3=活动专区1，4=活动专区2左侧，5=活动专区2右侧，6=专场专区1，7=专场专区2 ， 8=专场专区3 ， 9=专场专区4")
+    private Integer type;
+    @ApiModelProperty("所选商品")
+    private List<Goods> goodsList;
+    @ApiModelProperty("主标题")
+    private String title;
+    @ApiModelProperty("小标题")
+    private String title2;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsActiveDetail.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "GoodsNewsCategoryGoodsDetailBean对象", description = "活动商品详情")
+public class GoodsActiveDetail {
+
+
+
+    @ApiModelProperty("活动商品")
+    private List<GoodsNewsCategoryGoodsDetailBean> activeGoodsList;
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsBean.java

@@ -0,0 +1,46 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class GoodsBean extends Goods {
+
+    @ApiModelProperty("商品规格")
+    private List<GoodsSpec> goodsSpecs;
+
+    @ApiModelProperty("轮播图")
+    private List<CommonFile> images;
+
+    private String category1;
+    private String category2;
+    private String mainName;
+    private String smallName;
+    private Boolean isVr;
+
+    @ApiModelProperty("商品库存")
+    private Integer stock;
+    @ApiModelProperty("商品说明模板id")
+    private String templateId;
+    @ApiModelProperty("属性标签")
+    private List<String> tags;
+
+    @ApiModelProperty("标签")
+    private List<String> tagsLabel;
+
+    @ApiModelProperty("套购配置的比例商品")
+    private List<GoodsPackagePop> goodsPackagePops;
+    @ApiModelProperty("套购配置的指定用户-新增/编辑用")
+    private List<GoodsPackageUserRela> goodsPackageUserRelas;
+
+    @ApiModelProperty("套购商品配置的用户列表-详情用")
+    private List<User> users;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsCategoryBean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.GoodsCategory;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class GoodsCategoryBean extends GoodsCategory {
+
+    @ApiModelProperty( value = "子类别")
+    private List<GoodsCategoryBean> children;
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsCategoryUpdateBean.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 批量修改商品分类
+ * @author ：lijh
+ * @description：TODO
+ * @date ：2024/5/8 10:27
+ */
+@ApiModel
+@Data
+public class GoodsCategoryUpdateBean {
+    @ApiModelProperty("商品id")
+    private List<String> goodsIds;
+    @ApiModelProperty("分类id")
+    private String categoryId;
+
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsFreightBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class GoodsFreightBean {
+    @ApiModelProperty(value = "运费模板id")
+    private String freightTemplateId;
+
+    @ApiModelProperty(value = "商品id列表")
+    private List<String> goodsIdList;
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsNewsCategoryDetailBean.java

@@ -0,0 +1,20 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.GoodsNewsCategory;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "GoodsNewsCategoryDetailBean对象", description = "新维度分类详情")
+public class GoodsNewsCategoryDetailBean extends GoodsNewsCategory {
+
+    @ApiModelProperty("所有标签(标签1,标签2)")
+    private String allTag;
+
+    @ApiModelProperty("新维度分类商品详情")
+    private List<GoodsNewsCategoryGoodsDetailBean> goodsList;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsNewsCategoryGoodsDetailBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.goods;
+
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.GoodsNewsCategoryGoods;
+import com.gree.mall.manager.plus.entity.GoodsSpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "GoodsNewsCategoryGoodsDetailBean对象", description = "活动商品详情")
+public class GoodsNewsCategoryGoodsDetailBean extends GoodsNewsCategoryGoods {
+
+    @ApiModelProperty("商品")
+    private Goods goods;
+
+    @ApiModelProperty("商品规格")
+    private List<GoodsSpec> goodsSpecs;
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsNewsCategoryVimBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.GoodsNewsCategory;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "GoodsNewsCategoryVimBean对象", description = "新维度分类编辑bean")
+public class GoodsNewsCategoryVimBean extends GoodsNewsCategory {
+
+    @ApiModelProperty("所选商品")
+    private List<Goods> goodsList;
+
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsPackageBean.java

@@ -0,0 +1,24 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.GoodsPackagePop;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class GoodsPackageBean{
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("图片")
+    private String imgUrl;
+    @ApiModelProperty("规格")
+    private List<GoodsPackagePopBean> goodsPackagePopList;
+    @ApiModelProperty("排序")
+    private Integer sortNum;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsPackageList.java

@@ -0,0 +1,38 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class GoodsPackageList {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+    @ApiModelProperty("商品图")
+    private String imgUrl;
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("状态true=是 false=否")
+    private Boolean status;
+    @ApiModelProperty("参与产品数量")
+    private Integer goodsNums;
+    @ApiModelProperty("最低销售价")
+    private BigDecimal packageMinAmount;
+    @ApiModelProperty("最低分佣金额")
+    private BigDecimal packageMinShareAmount;
+    @ApiModelProperty("使用优惠券 0=不可使用 1=所有优惠券 2=满减券 3=商品券")
+    private Integer useCoupon;
+    @ApiModelProperty("适用范围 0=指定人员 1=所有人 2=普通用户 3=业务员")
+    private Integer packageUserType;
+    @ApiModelProperty("订单数量")
+    private Integer orderNums;
+    @ApiModelProperty("订单总金额")
+    private BigDecimal orderPayAmount;
+    @ApiModelProperty("商户")
+    private String companyName;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsPackagePopBean.java

@@ -0,0 +1,19 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.GoodsPackagePop;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class GoodsPackagePopBean extends GoodsPackagePop {
+
+    @ApiModelProperty("库存")
+    private Integer stock;
+    @ApiModelProperty("规格名称")
+    private String specName;
+    @ApiModelProperty("规格值")
+    private String specValue;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsSortBean.java

@@ -0,0 +1,45 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class GoodsSortBean {
+
+    @ApiModelProperty(value = "商品排序对应值 PRICE=销售价格 SHARE=分销金额 SOLD=销量 STOCK=库存")
+    private String sortColumn;
+    @ApiModelProperty(value = "true=升序 false=倒序")
+    private boolean type = true ;
+
+
+    public static String convertColumn(JSONArray goodsSortBeanArray) {
+        StringBuilder sb = new StringBuilder();
+
+        for(int i = 0; i < goodsSortBeanArray.size(); i++) {
+            GoodsSortBean goodsSortBean = goodsSortBeanArray.getObject(i, GoodsSortBean.class);
+            switch (goodsSortBean.getSortColumn()) {
+                case "PRICE" :
+                    sb.append("t2.price ").append(goodsSortBean.isType() ? "ASC," : "DESC,");
+                    break;
+                case "SHARE" :
+                    sb.append("t2.share_amount ").append(goodsSortBean.isType() ? "ASC," : "DESC,");
+                    break;
+                case "SOLD" :
+                    sb.append("t2.sold_num ").append(goodsSortBean.isType() ? "ASC," : "DESC,");
+                    break;
+                case "STOCK" :
+                    sb.append("t2.stock_num ").append(goodsSortBean.isType() ? "ASC," : "DESC,");
+                    break;
+                default :
+            }
+        }
+        if(sb.toString().length() == 0) {
+            return null;
+        }
+        String resStr = sb.toString();
+        return resStr.substring(0, resStr.length() - 1);
+    }
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsSpecBean.java

@@ -0,0 +1,60 @@
+package com.gree.mall.manager.bean.goods;
+
+import com.gree.mall.manager.plus.entity.Goods;
+import com.gree.mall.manager.plus.entity.GoodsSpec;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class GoodsSpecBean extends Goods {
+
+    @ApiModelProperty(value = "商品规格id")
+    private String goodsSpecId;
+
+    @ApiModelProperty(value = "规格值")
+    private String specValue;
+
+    @ApiModelProperty(value = "图片")
+    private String specImgUrl;
+
+    @ApiModelProperty(value = "成本价")
+    private BigDecimal costPrice;
+
+    @ApiModelProperty(value = "销售价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "划线价格")
+    private BigDecimal orgPrice;
+
+    @ApiModelProperty(value = "分销金额")
+    private BigDecimal shareAmount;
+
+    @ApiModelProperty(value = "分销比例")
+    private Double sharePercent;
+
+    @ApiModelProperty(value = "内部分销金额")
+    private BigDecimal innerShareAmount;
+
+    @ApiModelProperty(value = "内部分销比列")
+    private Double innerSharePercent;
+
+    @ApiModelProperty(value = "库存")
+    private Integer stockNum;
+
+    @ApiModelProperty(value = "商品类别名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "条形码")
+    private String barCode;
+
+    @ApiModelProperty("商品规格列表")
+    private List<GoodsSpec> goodsSpecs;
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsTemplateBean.java

@@ -0,0 +1,18 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class GoodsTemplateBean {
+
+    @ApiModelProperty(value = "模板id")
+    private String templateId;
+
+    @ApiModelProperty(value = "商品id列表")
+    private List<String> goodsIdList;
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsTypeCount.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 商品分类统计
+ */
+@ApiModel
+@Data
+public class GoodsTypeCount {
+
+    @ApiModelProperty("全部")
+    private Integer total;
+    @ApiModelProperty("出售中")
+    private Integer csz;
+    @ApiModelProperty("仓库中")
+    private Integer ckz;
+    @ApiModelProperty("活动中")
+    private Integer hdz;
+    @ApiModelProperty("已售罄")
+    private Integer ysq;
+
+
+}

src/main/java/com/gree/mall/manager/bean/goods/GoodsWIthGoodsTagBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.goods;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "GoodsWIthGoodsTagBean对象",description = "商品所选标签")
+public class GoodsWIthGoodsTagBean {
+
+    @ApiModelProperty("商品id")
+    private String goodsId;
+    @ApiModelProperty("标签")
+    private String tag;
+
+}

src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsDetailsBean.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.marketing;
+
+import com.gree.mall.manager.plus.entity.MarketingMaterials;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class DynamicMaterialsDetailsBean extends MarketingMaterials {
+
+    @ApiModelProperty("总点击次数")
+    private Integer totalCount;
+
+    @ApiModelProperty("总点击人数")
+    private Integer totalUserCount;
+
+    @ApiModelProperty("今日点击数")
+    private Integer todayCount;
+
+    @ApiModelProperty("今日点击人数")
+    private Integer todayUserCount;
+
+    @ApiModelProperty("客户浏览记录")
+    List<DynamicMaterialsVisitStatisticsBean> visitList;
+}

src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsPageBean.java

@@ -0,0 +1,23 @@
+package com.gree.mall.manager.bean.marketing;
+
+import com.gree.mall.manager.plus.entity.AdminUser;
+import com.gree.mall.manager.plus.entity.MarketingMaterials;
+import com.gree.mall.manager.plus.entity.Tag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 动态素材分页bean
+ */
+@ApiModel
+@Data
+public class DynamicMaterialsPageBean extends MarketingMaterials {
+
+    @ApiModelProperty("标签")
+    private List<Tag> tags;
+
+
+}

src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsVisitStatisticsBean.java

@@ -0,0 +1,26 @@
+package com.gree.mall.manager.bean.marketing;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class DynamicMaterialsVisitStatisticsBean {
+
+
+
+    @ApiModelProperty("客户名称")
+    private String username;
+
+    @ApiModelProperty("所属员工名称")
+    private String adminUsername;
+
+    @ApiModelProperty("最近点击时间")
+    private Date newTime;
+
+    @ApiModelProperty("总点击次数")
+    private Integer totalCount;
+}

src/main/java/com/gree/mall/manager/bean/marketing/MarketingMaterialsAddReqBean.java

@@ -0,0 +1,30 @@
+package com.gree.mall.manager.bean.marketing;
+
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.MarketingMaterials;
+import com.gree.mall.manager.plus.entity.Tag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 营销素材addReq bean
+ */
+@ApiModel
+@Data
+public class MarketingMaterialsAddReqBean extends MarketingMaterials {
+
+
+    @ApiModelProperty(value = "标签")
+    private List<Tag> tag;
+
+
+//
+//
+//    @ApiModelProperty(value = "封面图片")
+//    private CommonFile showImage;
+
+
+}

src/main/java/com/gree/mall/manager/bean/marketing/MarketingMaterialsUpdateReqBean.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.marketing;
+
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.MarketingMaterials;
+import com.gree.mall.manager.plus.entity.Tag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 营销素材addReq bean
+ */
+@ApiModel
+@Data
+public class MarketingMaterialsUpdateReqBean extends MarketingMaterials {
+
+    @ApiModelProperty(value = "标签")
+    private List<Tag> tag;
+
+}

src/main/java/com/gree/mall/manager/bean/member/MemberBean.java

@@ -0,0 +1,11 @@
+package com.gree.mall.manager.bean.member;
+
+import com.gree.mall.manager.plus.entity.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class MemberBean extends User {
+}

src/main/java/com/gree/mall/manager/bean/member/MemberSortBean.java

@@ -0,0 +1,41 @@
+package com.gree.mall.manager.bean.member;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gree.mall.manager.plus.entity.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class MemberSortBean {
+
+    @ApiModelProperty(value = "会员排序对应值 ID=编号 SEX=性别 CREATE=注册时间 STATUS=状态")
+    private String sortColumn;
+    @ApiModelProperty(value = "true=升序 false=倒序")
+    private boolean type = true ;
+
+
+    public static void convertColumn(JSONArray array, LambdaQueryWrapper<User> memberLambdaQueryWrapper) {
+
+        for(int i = 0; i < array.size(); i++) {
+            MemberSortBean bean = array.getObject(i, MemberSortBean.class);
+            switch (bean.getSortColumn()) {
+                case "ID" :
+                    memberLambdaQueryWrapper.orderBy(true, bean.isType(), User::getUserId);
+                    break;
+                case "SEX" :
+                    memberLambdaQueryWrapper.orderBy(true, bean.isType(), User::getSex);
+                    break;
+                case "CREATE" :
+                    memberLambdaQueryWrapper.orderBy(true, bean.isType(), User::getCreateTime);
+                    break;
+                case "STATUS" :
+                    memberLambdaQueryWrapper.orderBy(true, bean.isType(), User::getStatus);
+                    break;
+                default :
+            }
+        }
+    }
+}

src/main/java/com/gree/mall/manager/bean/offline/WebsitBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.offline;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class WebsitBean {
+
+    @ApiModelProperty("网点名称")
+    private String name;
+    @ApiModelProperty("网点编号")
+    private String websitNumber;
+
+}

src/main/java/com/gree/mall/manager/bean/offline/ZoneBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.offline;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class ZoneBean {
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("父id")
+    private String parentId;
+    @ApiModelProperty("区域名")
+    private String zoneName;
+}

src/main/java/com/gree/mall/manager/bean/order/BatchRemarkBean.java

@@ -0,0 +1,17 @@
+package com.gree.mall.manager.bean.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class BatchRemarkBean {
+
+    @ApiModelProperty("订单号列表")
+    private List<String> orderIds;
+    @ApiModelProperty("备注信息")
+    private String remark;
+}

src/main/java/com/gree/mall/manager/bean/order/DeliverGoodsBean.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.plus.entity.OrderDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class DeliverGoodsBean {
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("物流单号")
+    private String logisticsNo;
+    @ApiModelProperty("物流公司")
+    private String expressCorp;
+    @ApiModelProperty("仓库")
+    private String warehouse;
+    @ApiModelProperty("是否派单")
+    private Boolean send;
+    @ApiModelProperty("是否退换货")
+    private Boolean exchangeOrder;
+
+
+}

src/main/java/com/gree/mall/manager/bean/order/OrderDetailBean.java

@@ -0,0 +1,42 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.plus.entity.OrderComment;
+import com.gree.mall.manager.plus.entity.OrderCommentTag;
+import com.gree.mall.manager.plus.entity.OrderDetail;
+import com.gree.mall.manager.plus.entity.OrderInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class OrderDetailBean extends OrderInfo {
+
+    @ApiModelProperty("订单详情")
+    private List<OrderDetail> orderDetails;
+    @ApiModelProperty("卖家备注")
+    private String merchantRemark;
+    @ApiModelProperty("是否部分退款")
+    private String refund;
+    @ApiModelProperty("退款总金额")
+    private BigDecimal refundTotal;
+    @ApiModelProperty("是否可退款")
+    private Boolean refundAble;
+    @ApiModelProperty("派单成功(true=是 false=否)")
+    private Boolean toWorkOrder = false;
+    @ApiModelProperty("订单评价")
+    private OrderComment orderComment;
+    @ApiModelProperty("订单评价标签")
+    private List<String> orderCommentTags;
+    @ApiModelProperty("订单评价图片")
+    private List<String> orderCommentImgs;
+    @ApiModelProperty("团长名称")
+    private String promotionGroupUserName;
+    @ApiModelProperty("团长手机号")
+    private String promotionGroupMobile;
+
+
+}

src/main/java/com/gree/mall/manager/bean/order/OrderDetailListBean.java

@@ -0,0 +1,140 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.enums.OrderStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel
+public class OrderDetailListBean {
+
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    private String goodsCode;
+
+    @ApiModelProperty("规格型号")
+    private String goodsSpecValue;
+
+    @ApiModelProperty("数量")
+    private Integer num;
+
+    @ApiModelProperty("销售单价")
+    private String price;
+
+    @ApiModelProperty("实际支付价格")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty("支付总额(实际支付价格*数量)")
+    private BigDecimal totalPrice;
+
+    @ApiModelProperty("收货人名称")
+    private String receUserName;
+
+    @ApiModelProperty("收货人电话")
+    private String recePhone;
+
+    @ApiModelProperty("收货人地址")
+    private String address;
+
+    @ApiModelProperty("订单状态")
+    private String orderStatus;
+
+    @ApiModelProperty("退款标记")
+    private String refundFlag;
+
+    @ApiModelProperty("退款金额")
+    private String refundAmount;
+
+    @ApiModelProperty("退款数量")
+    private String refundNum;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("下单时间")
+    private Date createTime;
+
+    private Date payTime;
+
+    @ApiModelProperty("买家昵称")
+    private String userName;
+
+    @ApiModelProperty("购买渠道")
+    private String workerName;
+
+    @ApiModelProperty("买家备注")
+    private String buyerMsg;
+
+    @ApiModelProperty("网点")
+    private String websitName;
+
+    @ApiModelProperty("业务员/网点")
+    private String workerNameWithWebsitName;
+
+    @ApiModelProperty("业务员手机号")
+    private String workerPhone;
+
+    @ApiModelProperty("分佣金额")
+    private String shareAmount;
+
+    @ApiModelProperty("团长名称")
+    private String nickName;
+
+    @ApiModelProperty("团长手机号")
+    private String mobile;
+
+    @ApiModelProperty("卖家留言")
+    private String refundMessage;
+
+    @ApiModelProperty("团购活动id")
+    private String promotionGroupId;
+
+    @ApiModelProperty("工单编号")
+    private String workerOrderNo;
+
+    @ApiModelProperty("评价商品的星数(0未评价)")
+    private Integer commentGoods;
+
+    @ApiModelProperty("评价服务的星数(0未评价)")
+    private Integer commentService;
+
+    @ApiModelProperty("评价物流的星数(0未评价)")
+    private Integer commentExpress;
+
+    @ApiModelProperty("退货说明")
+    private String refundExplain;
+
+    @ApiModelProperty("INSTALL和REPAIR")
+    private String workOrderType;
+
+    @ApiModelProperty("是否已入驻企业微信")
+    private Boolean isAddCorp;
+
+    @ApiModelProperty("是否为套购商品")
+    private Boolean promotionPackageGoods;
+
+    @ApiModelProperty("购买人姓名")
+    private String buyerName;
+
+    @ApiModelProperty("购买人身份证")
+    private String buyerIdCard;
+
+    @ApiModelProperty("国补金额")
+    private BigDecimal couponMerchantContribute;
+
+    @ApiModelProperty("条形码")
+    private String barCode;
+
+    @ApiModelProperty("交易流水号")
+    private String transactionId;
+
+}

src/main/java/com/gree/mall/manager/bean/order/OrderRefundDetailBean.java

@@ -0,0 +1,27 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.OrderDetail;
+import com.gree.mall.manager.plus.entity.OrderRefund;
+import com.gree.mall.manager.plus.entity.OrderRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class OrderRefundDetailBean extends OrderRefund {
+
+    @ApiModelProperty("订单详情")
+    private List<OrderDetail> orderDetails;
+    @ApiModelProperty("物流凭证")
+    private List<CommonFile> files;
+    @ApiModelProperty("退款凭证")
+    private List<CommonFile> tkFiles;
+    @ApiModelProperty("工单信息")
+    private List<OrderRequest> orderRequests;
+    private Boolean toWorkOrder = false;
+
+}

src/main/java/com/gree/mall/manager/bean/order/OrderShareReportBean.java

@@ -0,0 +1,148 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.plus.entity.OrderDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@ApiModel
+@Data
+public class OrderShareReportBean {
+
+    @ApiModelProperty("商城名称")
+    private String shopName;
+
+    @ApiModelProperty("结算编号")
+    private String orderShareId;
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+
+   /* @ApiModelProperty("商品名")
+    private String goodsName;*/
+
+    /*@ApiModelProperty("单价")
+    private BigDecimal price;*/
+
+    /*@ApiModelProperty("数量")
+    private Integer num;*/
+
+    @ApiModelProperty("总价")
+    private BigDecimal totalPrice;
+    @ApiModelProperty("实付金额")
+    private BigDecimal payAmount;
+    @ApiModelProperty("运费")
+    private BigDecimal freight;
+
+    @ApiModelProperty("订单状态,是否售后")
+    private String orderStatus;
+    @ApiModelProperty("退款标记ING(退款中),PARTLY(部分退),ALL(全部退),COMMONLY(正常状态)")
+    private String refundFlag;
+
+    @ApiModelProperty("下单用户账号")
+    private String userId;
+
+    @ApiModelProperty("下单时间")
+    private Date createTime;
+
+    @ApiModelProperty("支付方式")
+    private String payType;
+
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
+    @ApiModelProperty("买家备注")
+    private String remark;
+
+    @ApiModelProperty("收货人")
+    private String receUserName;
+
+    @ApiModelProperty("收货电话")
+    private String recePhone;
+
+    @ApiModelProperty("收货地址")
+    private String address;
+
+    @ApiModelProperty("物流单号")
+    private String logisticsNo;
+
+    @ApiModelProperty("物流公司")
+    private String name;
+
+    @ApiModelProperty("发票类型")
+    private Boolean type;
+
+    @ApiModelProperty("发票抬头")
+    private String taxName;
+
+    @ApiModelProperty("发票内容")
+    private String content;
+
+    @ApiModelProperty("纳税人识别号")
+    private String taxNo;
+
+    @ApiModelProperty("公司注册地址")
+    private String registerAddress;
+
+    @ApiModelProperty("公司注册电话")
+    private String registerPhone;
+
+    @ApiModelProperty("开户行")
+    private String bank;
+
+    @ApiModelProperty("开户账号")
+    private String account;
+
+    @ApiModelProperty("接收邮箱")
+    private String receiverEmail;
+
+    @ApiModelProperty("接收手机号")
+    private String receiverPhone;
+
+    @ApiModelProperty("发票收件人")
+    private String receiverName;
+
+    @ApiModelProperty("发票收件地址")
+    private String receiverAddress;
+
+    @ApiModelProperty("折扣金额")
+    private BigDecimal discountAmount;
+
+    @ApiModelProperty("优惠券名称")
+    private String couponName;
+
+    @ApiModelProperty("交易号")
+    private String transactionId;
+
+    @ApiModelProperty("佣金结算状态")
+    private String shareStatus;
+
+    @ApiModelProperty("分销员")
+    private String workUserName;
+
+    @ApiModelProperty("所属网点")
+    private String websitName;
+
+/*
+    @ApiModelProperty("商品佣金")
+    private BigDecimal shareAmount;
+*/
+
+    @ApiModelProperty("订单佣金")
+    private BigDecimal amount;
+
+    @ApiModelProperty("结算时间")
+    private Date settleTime;
+
+
+    @ApiModelProperty("职位")
+    private String position;
+/*    @ApiModelProperty("大类编号")
+    private String mainNumber;*/
+
+
+}

src/main/java/com/gree/mall/manager/bean/order/WorkerOrderInfo.java

@@ -0,0 +1,107 @@
+package com.gree.mall.manager.bean.order;
+
+import com.gree.mall.manager.plus.entity.OrderDetail;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@ApiModel
+@Data
+public class WorkerOrderInfo {
+
+    @ApiModelProperty("信息编号")
+    private String workerOrder;
+    @ApiModelProperty("总部信息编号")
+    private String pgid;
+    @ApiModelProperty("工单状态数值")
+    private Integer orderStateInt;
+    @ApiModelProperty("工单状态")
+    private String orderState;
+    @ApiModelProperty("售后服务网点编号")
+    private String installNumber;
+    @ApiModelProperty("售后服务网点名称")
+    private String installName;
+    @ApiModelProperty("主要服务人员")
+    private String workerName;
+    @ApiModelProperty("主要服务人员电话")
+    private String workerPhone;
+    @ApiModelProperty("工单接收时间")
+    private String orderReceTime;
+    @ApiModelProperty("完工时间")
+    private String finishTime;
+    @ApiModelProperty("工单反馈信息")
+    private List<Fkxx> fkxxs;
+    @ApiModelProperty("辅材支付信息")
+    private List<Fcxx> fcxxs;
+    @ApiModelProperty("订单明细")
+    private List<OrderDetail> orderDetails;
+    @ApiModelProperty("订单号")
+    private String orderId;
+    @ApiModelProperty("下单时间")
+    private Date payTime;
+    @ApiModelProperty("辅助人员名称")
+    private String assistName;
+    @ApiModelProperty("预约时间")
+    private String reserveTime;
+    @ApiModelProperty("服务内容")
+    private String serverContent;
+    @ApiModelProperty("支架")
+    private String bracket;
+    @ApiModelProperty("加长管")
+    private String pipe;
+    @ApiModelProperty("空气开关")
+    private String switchFlag;
+    @ApiModelProperty("高空作业")
+    private String highAltitude;
+    @ApiModelProperty("一次成型墙孔")
+    private String hole;
+    @ApiModelProperty("服务备注")
+    private String remark;
+
+    @ApiModel
+    @Data
+    public static class Fkxx{
+        @ApiModelProperty("操作类型")
+        private String operatorType;
+        @ApiModelProperty("操作内容")
+        private String operatorContent;
+        @ApiModelProperty("最后操作时间")
+        private String lastOperatorTime;
+        @ApiModelProperty("操作人")
+        private String operatorName;
+        @ApiModelProperty("操作网点")
+        private String operatorWebsit;
+        @ApiModelProperty("反馈结果")
+        private String result;
+        @ApiModelProperty("附件")
+        private String files;
+    }
+
+    @ApiModel
+    @Data
+    public static class Fcxx{
+        @ApiModelProperty("id")
+        private Integer id;
+        @ApiModelProperty("费用单号")
+        private String orderNo;
+        @ApiModelProperty("操作网点")
+        private String operatorWebsit;
+        @ApiModelProperty("操作人")
+        private String operatorName;
+        @ApiModelProperty("支付状态")
+        private String payStatus;
+        @ApiModelProperty("支付时间")
+        private String payTime;
+        @ApiModelProperty("金额")
+        private String amount;
+        @ApiModelProperty("备注")
+        private String remark;
+        @ApiModelProperty("详情")
+        private List<Map<String,Object>> details;
+    }
+
+}

src/main/java/com/gree/mall/manager/bean/report/ReportBean.java

@@ -0,0 +1,13 @@
+package com.gree.mall.manager.bean.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class ReportBean {
+
+    @ApiModelProperty("订单号")
+    private String orderId;
+}

src/main/java/com/gree/mall/manager/bean/sop/File.java

@@ -0,0 +1,13 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+public class File {
+
+
+    private String media_id;
+
+
+}

src/main/java/com/gree/mall/manager/bean/sop/Image.java

@@ -0,0 +1,13 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+public class Image {
+
+    private String media_id;
+
+    private String pic_url;
+
+}

src/main/java/com/gree/mall/manager/bean/sop/Link.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+public class Link {
+
+    private String title;
+
+    private String picurl;
+    private String desc;
+    private String url;
+
+}

src/main/java/com/gree/mall/manager/bean/sop/Miniprogram.java

@@ -0,0 +1,15 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+public class Miniprogram {
+
+    private String title;
+
+    private String pic_media_id;
+    private String appid;
+    private String page;
+
+}

src/main/java/com/gree/mall/manager/bean/sop/SopPushAdd.java

@@ -0,0 +1,36 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author change
+ */
+@ApiModel
+@Data
+public class SopPushAdd {
+
+    @ApiModelProperty("附件类型，可选image、link、miniprogram或者video")
+    private String msgtype;
+
+    @ApiModelProperty("照片")
+    private  Image image;
+
+    @ApiModelProperty("图文消息")
+    private  Link link;
+
+    @ApiModelProperty("小程序消息")
+    private  Miniprogram miniprogram;
+
+    @ApiModelProperty("视频")
+    private  Video video;
+
+    @ApiModelProperty("文件")
+    private  File file;
+
+
+}
+

src/main/java/com/gree/mall/manager/bean/sop/SopPushTaskData.java

@@ -0,0 +1,31 @@
+package com.gree.mall.manager.bean.sop;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.List;
+
+import com.gree.mall.manager.plus.entity.SopPushTask;
+import com.gree.mall.manager.plus.entity.SopPushTaskTag;
+import com.gree.mall.manager.plus.entity.Tag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author change
+ */
+@ApiModel
+@Data
+public class SopPushTaskData extends SopPushTask {
+
+    @ApiModelProperty(value = "标签")
+    private List<Tag> tags;
+
+
+
+}

src/main/java/com/gree/mall/manager/bean/sop/SopRuleAdd.java

@@ -0,0 +1,33 @@
+package com.gree.mall.manager.bean.sop;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author change
+ */
+@ApiModel
+@Data
+public class SopRuleAdd {
+
+    @ApiModelProperty("规则名字")
+    private String ruleName;
+
+    @ApiModelProperty("规则id")
+    private  String id;
+
+    @ApiModelProperty("状态1启用 0停用")
+    private Integer status;
+
+    @ApiModelProperty("客服ID，多个")
+    private List<String> workerIds;
+
+
+    @ApiModelProperty("任务多个")
+    private List<SopPushTaskData> sopPushTaskData;
+}

src/main/java/com/gree/mall/manager/bean/sop/SopRuleData.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.sop;
+
+import com.gree.mall.manager.plus.entity.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author change
+ */
+@ApiModel
+@Data
+public class SopRuleData  extends SopRule {
+
+    @ApiModelProperty("任务")
+    private List<SopPushTaskData> sopPushTask;
+
+    @ApiModelProperty("客服成员")
+    private List<EnterpriseWechatWorker> enterpriseWechatWorkers;
+}